public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [flatpaks/flatpak-runtime] f45: Update to F32 and switch to GNOME 3.36 runtime
@ 2026-09-11 14:41 Kalev Lember
0 siblings, 0 replies; only message in thread
From: Kalev Lember @ 2026-09-11 14:41 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : flatpaks/flatpak-runtime
Branch : f45
Commit : af2ef9250bd0ea5ae4cf489057d52d73873ae118
Author : Kalev Lember <klember@redhat.com>
Date : 2020-03-20T21:54:12+01:00
Stats : +130/-88 in 8 file(s)
URL : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/af2ef9250bd0ea5ae4cf489057d52d73873ae118?branch=f45
Log:
Update to F32 and switch to GNOME 3.36 runtime
---
diff --git a/README.md b/README.md
index 7f33a76..02e5383 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ Updating
* `org.freedesktop.Platform/x86_64/19.08`
* `org.freedesktop.Sdk/x86_64/19.08`
-* `org.gnome.Platform/x86_64/3.34`
-* `org.gnome.Sdk/x86_64/3.34`
+* `org.gnome.Platform/x86_64/3.36`
+* `org.gnome.Sdk/x86_64/3.36`
You also need `python3-jinja2` and possibly a few other Python
packages installed.
diff --git a/container.yaml b/container.yaml
index b2a0f99..373624f 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,10 +1,10 @@
compose:
modules:
- - flatpak-runtime:f31
+ - flatpak-runtime:f32
flatpak:
id: org.fedoraproject.Platform
- name: f31/flatpak-runtime
- branch: f31
+ name: f32/flatpak-runtime
+ branch: f32
sdk: org.fedoraproject.Sdk
finish-args: >
--env=GI_TYPELIB_PATH=/app/lib64/girepository-1.0
diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index 96fbb3d..336e39c 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -12,9 +12,9 @@ data:
- MIT
dependencies:
buildrequires:
- platform: f31
+ platform: f32
requires:
- platform: f31
+ platform: f32
profiles:
runtime:
rpms:
@@ -41,6 +41,7 @@ data:
- bash
- bluez-libs
- brotli
+ - libbrotli
- bubblewrap
- bzip2
- bzip2-libs
@@ -49,6 +50,7 @@ data:
- cairo-gobject
- cdparanoia-libs
- alternatives
+ - clang-libs
- clutter
- clutter-gst3
- clutter-gtk
@@ -72,11 +74,10 @@ data:
- dbus-tools
- dbus-broker
- dconf
- - dejavu-fonts-common
- - dejavu-math-tex-gyre-fonts
+ - compat-f32-dejavu-sans-fonts
+ - compat-f32-dejavu-sans-mono-fonts
+ - compat-f32-dejavu-serif-fonts
- dejavu-sans-fonts
- - dejavu-sans-mono-fonts
- - dejavu-serif-fonts
- desktop-file-utils
- diffutils
- e2fsprogs-libs
@@ -104,7 +105,6 @@ data:
- flatpak-xdg-utils
- fontconfig
- fonts-filesystem
- - freeglut
- freetype
- fribidi
- gawk
@@ -126,7 +126,6 @@ data:
- gdbm-libs
- gdk-pixbuf2
- gdk-pixbuf2-modules
- - gdk-pixbuf2-xlib
- geoclue2
- geoclue2-libs
- gettext
@@ -177,6 +176,7 @@ data:
- gtk3
- gtk3-immodule-xim
- gtk3-immodules
+ - gtksourceview4
- gupnp
- gupnp-igd
- gzip
@@ -213,6 +213,7 @@ data:
- libkadm5
- ladspa
- lame-libs
+ - langpacks-core-font-en
- lcms2
- lcms2-utils
- less
@@ -287,7 +288,10 @@ data:
- libksba
- libmetalink
- libmng
+ - libmnl
- libmodman
+ - libnetfilter_conntrack
+ - libnfnetlink
- libnice
- libnice-gstreamer1
- libnotify
@@ -374,7 +378,7 @@ data:
- glx-utils
- mesa-libGLU
- mlocate
- - mozjs60
+ - mozjs68
- mpfr
- mpg123-libs
- mtdev
@@ -411,7 +415,9 @@ data:
- pcre-cpp
- pcre2
- pcre2-utf16
+ - pipewire-gstreamer
- pipewire-libs
+ - pipewire0.2-libs
- pixman
- libpkgconf
- pkgconf
@@ -425,14 +431,14 @@ data:
- python3-cairo
- python3-gobject
- python3-gobject-base
+ - python3-mako
+ - python3-markdown
+ - python3-markupsafe
- python-pip-wheel
- python3-pip
- python-setuptools-wheel
- - python2-setuptools
- python3-setuptools
- python3-six
- - python2
- - python2-libs
- python3
- python3-libs
- qgnomeplatform
@@ -471,7 +477,7 @@ data:
- SDL2_mixer
- SDL2_net
- SDL2_ttf
- - sbc
+ - libsbc
- sed
- serd
- setup
@@ -505,8 +511,6 @@ data:
- util-linux
- uuidd
- libv4l
- - vte-profile
- - vte291
- vulkan-loader
- vulkan-validation-layers
- wavpack
@@ -550,7 +554,6 @@ data:
rpms:
- flatpak-runtime-config
- liba52
- - abattis-cantarell-fonts
- acl
- libacl
- adwaita-cursor-theme
@@ -571,7 +574,7 @@ data:
- basesystem
- bash
- bluez-libs
- - brotli
+ - libbrotli
- bzip2
- bzip2-libs
- ca-certificates
@@ -579,6 +582,7 @@ data:
- cairo-gobject
- cdparanoia-libs
- alternatives
+ - clang-libs
- colord-libs
- coreutils
- coreutils-common
@@ -597,11 +601,10 @@ data:
- dbus-tools
- dbus-broker
- dconf
- - dejavu-fonts-common
- - dejavu-math-tex-gyre-fonts
+ - compat-f32-dejavu-sans-fonts
+ - compat-f32-dejavu-sans-mono-fonts
+ - compat-f32-dejavu-serif-fonts
- dejavu-sans-fonts
- - dejavu-sans-mono-fonts
- - dejavu-serif-fonts
- diffutils
- e2fsprogs-libs
- libcom_err
@@ -626,7 +629,6 @@ data:
- flatpak-xdg-utils
- fontconfig
- fonts-filesystem
- - freeglut
- freetype
- fribidi
- gawk
@@ -724,6 +726,7 @@ data:
- krb5-libs
- ladspa
- lame-libs
+ - langpacks-core-font-en
- lcms2
- lcms2-utils
- less
@@ -795,8 +798,11 @@ data:
- libksba
- libmetalink
- libmng
+ - libmnl
- libmodman
- libmpeg2
+ - libnetfilter_conntrack
+ - libnfnetlink
- libnice
- libnice-gstreamer1
- libnotify
@@ -910,7 +916,9 @@ data:
- pcre-cpp
- pcre2
- pcre2-utf16
+ - pipewire-gstreamer
- pipewire-libs
+ - pipewire0.2-libs
- pixman
- libpkgconf
- pkgconf
@@ -921,19 +929,14 @@ data:
- publicsuffix-list-dafsa
- pulseaudio-libs
- pulseaudio-libs-glib2
- - python2-mako
- python3-mako
- python3-markdown
- - python2-markupsafe
- python3-markupsafe
- python-pip-wheel
- python3-pip
- python-setuptools-wheel
- - python2-setuptools
- python3-setuptools
- python3-six
- - python2
- - python2-libs
- python3
- python3-libs
- qgnomeplatform
@@ -972,7 +975,7 @@ data:
- SDL2_mixer
- SDL2_net
- SDL2_ttf
- - sbc
+ - libsbc
- sed
- serd
- setup
@@ -1079,6 +1082,7 @@ data:
- boost-regex
- brotli
- brotli-devel
+ - libbrotli
- bubblewrap
- byacc
- bzip2
@@ -1101,6 +1105,7 @@ data:
- clang-libs
- clang-tools-extra
- git-clang-format
+ - clang9.0-libs
- clutter
- clutter-devel
- clutter-gst3
@@ -1144,11 +1149,10 @@ data:
- dbus-broker
- dconf
- dconf-devel
- - dejavu-fonts-common
- - dejavu-math-tex-gyre-fonts
+ - compat-f32-dejavu-sans-fonts
+ - compat-f32-dejavu-sans-mono-fonts
+ - compat-f32-dejavu-serif-fonts
- dejavu-sans-fonts
- - dejavu-sans-mono-fonts
- - dejavu-serif-fonts
- desktop-file-utils
- diffutils
- docbook-dtds
@@ -1207,7 +1211,6 @@ data:
- fonts-filesystem
- fonts-srpm-macros
- fpc-srpm-macros
- - freeglut
- freetype
- freetype-devel
- frei0r-devel
@@ -1249,8 +1252,6 @@ data:
- gdk-pixbuf2
- gdk-pixbuf2-devel
- gdk-pixbuf2-modules
- - gdk-pixbuf2-xlib
- - gdk-pixbuf2-xlib-devel
- geoclue2
- geoclue2-devel
- geoclue2-libs
@@ -1341,6 +1342,8 @@ data:
- gtk3-devel
- gtk3-immodule-xim
- gtk3-immodules
+ - gtksourceview4
+ - gtksourceview4-devel
- guile
- guile22
- gupnp
@@ -1401,6 +1404,7 @@ data:
- ladspa-devel
- lame-devel
- lame-libs
+ - langpacks-core-font-en
- lcms2
- lcms2-devel
- lcms2-utils
@@ -1448,6 +1452,8 @@ data:
- libXtst-devel
- libXv
- libXv-devel
+ - libXvMC
+ - libXvMC-devel
- libXxf86vm
- libXxf86vm-devel
- libappstream-glib
@@ -1459,7 +1465,6 @@ data:
- libassuan
- libassuan-devel
- libasyncns
- - libatomic_ops
- libavc1394
- libcanberra
- libcanberra-devel
@@ -1468,10 +1473,10 @@ data:
- libcap
- libcap-devel
- libcap-ng
+ - libcbor
- libclc
- libclc-devel
- libcroco
- - libcroco-devel
- libdatrie
- libdatrie-devel
- libdb
@@ -1495,6 +1500,7 @@ data:
- libexif-devel
- libffi
- libffi-devel
+ - libfido2
- libfontenc
- libgcrypt
- libgcrypt-devel
@@ -1528,9 +1534,12 @@ data:
- libmetalink
- libmikmod
- libmng
+ - libmnl
- libmodman
- libmodplug
- libmpc
+ - libnetfilter_conntrack
+ - libnfnetlink
- libnice
- libnice-devel
- libnice-gstreamer1
@@ -1643,6 +1652,7 @@ data:
- llvm-devel
- llvm-libs
- llvm-test
+ - llvm9.0-libs
- lua
- lua-libs
- lua-posix
@@ -1660,13 +1670,10 @@ data:
- mcpp
- mesa-dri-drivers
- mesa-filesystem
- - mesa-khr-devel
- mesa-libEGL
- mesa-libEGL-devel
- mesa-libGL
- mesa-libGL-devel
- - mesa-libGLES
- - mesa-libGLES-devel
- mesa-libOSMesa
- mesa-libOSMesa-devel
- mesa-libd3d
@@ -1680,8 +1687,8 @@ data:
- mesa-libGLU
- meson
- mlocate
- - mozjs60
- - mozjs60-devel
+ - mozjs68
+ - mozjs68-devel
- mpfr
- mpg123-devel
- mpg123-libs
@@ -1904,8 +1911,10 @@ data:
- perl-threads-shared
- perl-version
- physfs
- - pipewire-devel
+ - pipewire-gstreamer
- pipewire-libs
+ - pipewire0.2-devel
+ - pipewire0.2-libs
- pixman
- pixman-devel
- libpkgconf
@@ -1928,19 +1937,20 @@ data:
- python3-gobject-base
- python3-gobject-devel
- python3-pyparsing
+ - python3-anytree
- python3-lit
+ - python3-lxml
- python3-mako
+ - python3-markdown
- python3-markupsafe
+ - python3-parameterized
- python-pip-wheel
- python3-pip
- python3-pygments
- python-srpm-macros
- python-setuptools-wheel
- - python2-setuptools
- python3-setuptools
- python3-six
- - python2
- - python2-libs
- python3
- python3-devel
- python3-libs
@@ -2005,6 +2015,7 @@ data:
- ruby-devel
- ruby-libs
- rubygem-bundler
+ - rubygem-did_you_mean
- rubygem-io-console
- rubygem-irb
- rubygem-openssl
@@ -2027,7 +2038,7 @@ data:
- SDL2_ttf
- SDL2_ttf-devel
- SDL_sound
- - sbc
+ - libsbc
- sed
- serd
- setup
@@ -2088,9 +2099,6 @@ data:
- valgrind-tools-devel
- vim-filesystem
- vim-minimal
- - vte-profile
- - vte291
- - vte291-devel
- vulkan-headers
- vulkan-loader
- vulkan-loader-devel
@@ -2141,6 +2149,7 @@ data:
- xorg-x11-xkb-utils
- xorg-x11-xkb-utils-devel
- xorg-x11-xtrans-devel
+ - xxhash-libs
- xz
- xz-devel
- xz-libs
@@ -2160,7 +2169,6 @@ data:
rpms:
- flatpak-runtime-config
- liba52
- - abattis-cantarell-fonts
- acl
- libacl
- libacl-devel
@@ -2202,6 +2210,7 @@ data:
- boost-regex
- brotli
- brotli-devel
+ - libbrotli
- byacc
- bzip2
- bzip2-devel
@@ -2223,6 +2232,7 @@ data:
- clang-libs
- clang-tools-extra
- git-clang-format
+ - clang9.0-libs
- cmake
- cmake-data
- cmake-filesystem
@@ -2257,11 +2267,10 @@ data:
- dbus-broker
- dconf
- dconf-devel
- - dejavu-fonts-common
- - dejavu-math-tex-gyre-fonts
+ - compat-f32-dejavu-sans-fonts
+ - compat-f32-dejavu-sans-mono-fonts
+ - compat-f32-dejavu-serif-fonts
- dejavu-sans-fonts
- - dejavu-sans-mono-fonts
- - dejavu-serif-fonts
- desktop-file-utils
- diffutils
- docbook-dtds
@@ -2318,7 +2327,6 @@ data:
- fonts-filesystem
- fonts-srpm-macros
- fpc-srpm-macros
- - freeglut
- freetype
- freetype-devel
- frei0r-devel
@@ -2496,6 +2504,7 @@ data:
- ladspa-devel
- lame-devel
- lame-libs
+ - langpacks-core-font-en
- lcms2
- lcms2-devel
- lcms2-utils
@@ -2543,6 +2552,8 @@ data:
- libXtst-devel
- libXv
- libXv-devel
+ - libXvMC
+ - libXvMC-devel
- libXxf86vm
- libXxf86vm-devel
- libappstream-glib
@@ -2554,11 +2565,11 @@ data:
- libassuan
- libassuan-devel
- libasyncns
- - libatomic_ops
- libavc1394
- libcap
- libcap-devel
- libcap-ng
+ - libcbor
- libcdio
- libclc
- libclc-devel
@@ -2587,6 +2598,7 @@ data:
- libexif-devel
- libffi
- libffi-devel
+ - libfido2
- libgcrypt
- libgcrypt-devel
- libgdither
@@ -2616,10 +2628,13 @@ data:
- libmetalink
- libmikmod
- libmng
+ - libmnl
- libmodman
- libmodplug
- libmpc
- libmpeg2
+ - libnetfilter_conntrack
+ - libnfnetlink
- libnice
- libnice-devel
- libnice-gstreamer1
@@ -2648,7 +2663,6 @@ data:
- libsamplerate-devel
- libseccomp
- libseccomp-devel
- - libsecret
- libselinux
- libselinux-devel
- libselinux-utils
@@ -2726,6 +2740,7 @@ data:
- llvm-devel
- llvm-libs
- llvm-test
+ - llvm9.0-libs
- lua-libs
- device-mapper
- device-mapper-libs
@@ -2739,13 +2754,10 @@ data:
- libmcpp
- mcpp
- mesa-filesystem
- - mesa-khr-devel
- mesa-libEGL
- mesa-libEGL-devel
- mesa-libGL
- mesa-libGL-devel
- - mesa-libGLES
- - mesa-libGLES-devel
- mesa-libOSMesa
- mesa-libOSMesa-devel
- mesa-libd3d
@@ -2977,8 +2989,10 @@ data:
- perl-threads-shared
- perl-version
- physfs
- - pipewire-devel
+ - pipewire-gstreamer
- pipewire-libs
+ - pipewire0.2-devel
+ - pipewire0.2-libs
- pixman
- pixman-devel
- libpkgconf
@@ -2996,21 +3010,20 @@ data:
- pulseaudio-libs-devel
- pulseaudio-libs-glib2
- python3-pyparsing
+ - python3-anytree
- python3-lit
- - python2-mako
+ - python3-lxml
- python3-mako
- python3-markdown
- - python2-markupsafe
- python3-markupsafe
+ - python3-parameterized
- python-pip-wheel
- python3-pip
+ - python3-pygments
- python-srpm-macros
- python-setuptools-wheel
- - python2-setuptools
- python3-setuptools
- python3-six
- - python2
- - python2-libs
- python3
- python3-devel
- python3-libs
@@ -3075,6 +3088,7 @@ data:
- ruby-devel
- ruby-libs
- rubygem-bundler
+ - rubygem-did_you_mean
- rubygem-io-console
- rubygem-irb
- rubygem-openssl
@@ -3097,7 +3111,7 @@ data:
- SDL2_ttf
- SDL2_ttf-devel
- SDL_sound
- - sbc
+ - libsbc
- sed
- serd
- setup
@@ -3192,6 +3206,7 @@ data:
- xorg-x11-xkb-utils
- xorg-x11-xkb-utils-devel
- xorg-x11-xtrans-devel
+ - xxhash-libs
- xz
- xz-devel
- xz-libs
@@ -3213,13 +3228,13 @@ data:
rpms:
flatpak-rpm-macros:
rationale: Set up build root for flatpak RPMS
- ref: f31
+ ref: f32
flatpak-runtime-config:
rationale: Runtime configuration files
- ref: f31
+ ref: f32
xmd:
flatpak:
- branch: f31
+ branch: f32
runtimes:
runtime:
id: org.fedoraproject.Platform
diff --git a/package-notes.txt b/package-notes.txt
index 9cb0320..c3da1de 100644
--- a/package-notes.txt
+++ b/package-notes.txt
@@ -129,8 +129,6 @@ p11-kit-server: EB: provides p11-kit-client.so to make certificates work in cont
pam: FD: systemd, util-linux
pkgconf-pkg-config: EB: hard to build, xorg-x11-font-utils wants
publicsuffix-list-dafsa
-python2: EB
-python2-setuptools: EB
python3-cairo: E
python3-gobject: E
python3-libs
diff --git a/tools/download-fedora-appstream.sh b/tools/download-fedora-appstream.sh
index 648c1d2..2b919f3 100755
--- a/tools/download-fedora-appstream.sh
+++ b/tools/download-fedora-appstream.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
-nvr=$(koji list-tagged --quiet --inherit --latest f31-build appstream-data|awk '{print $1}')
+nvr=$(koji list-tagged --quiet --inherit --latest f32-build appstream-data|awk '{print $1}')
path=$(koji buildinfo $nvr | grep noarch.rpm)
url=$(echo $path | sed s@/mnt/koji/packages/@https://kojipkgs.fedoraproject.org/packages/@)
diff --git a/tools/generate-files.sh b/tools/generate-files.sh
index 3006c38..ad28b16 100755
--- a/tools/generate-files.sh
+++ b/tools/generate-files.sh
@@ -10,7 +10,7 @@ case $base in
;;
gnome-*)
ns=org.gnome
- version=3.34
+ version=3.36
;;
*)
echo 1>&2 "Can't identify runtime for $base"
diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index 88b1a9a..24ced64 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -78,6 +78,9 @@ bin_ignore = [
# just want cyrus-sasl-libs
'pluginviewer', 'saslauthd', 'sasldblistusers2', 'saslpasswd2', 'testsaslauthd',
+ # cups-printerapp - just want cups-libs
+ 'ippeveprinter',
+
# just want libdav1d
'dav1d',
@@ -191,6 +194,7 @@ bin_rename = {
# conflicts between lcms and lcms2 - jpegicc was renamed to jpgicc, etc.
'jpgicc': 'jpgicc2',
'linkicc': 'linkicc2',
+ 'perl5.30.0': 'perl',
'psicc': 'psicc2',
'tificc': 'tificc2',
'transicc': 'transicc2',
@@ -211,22 +215,43 @@ ignore.update('/usr/lib64/' + x for x in lib_ignore)
lib_rename = {
# Newer in Fedora
+ 'libasan.so.5': 'libasan.so.6',
+ 'libclang.so.8': 'libclang.so.10',
+ 'libdav1d.so.2': 'libdav1d.so.3',
'libkadm5clnt_mit.so.11': 'libkadm5clnt_mit.so.12',
'libkadm5srv_mit.so.11': 'libkadm5srv_mit.so.12',
+ 'libkdb5.so.9': 'libkdb5.so.10',
+ 'libLTO.so.8': 'libLTO.so.10',
+ 'libpython3.7m.so': 'libpython3.8.so',
'libverto.so.0': 'libverto.so.1',
# Replaced by libxcrypt in Fedora
'libcrypt-2.30.so': 'libcrypt.so.2',
+ # Compat symlink in gcr
+ 'libgcr-3.so.1': 'libgcr-ui-3.so.1',
+
# Fedora arch-handling
'ld-linux.so.2': 'ld-linux-x86-64.so.2',
}
rename.update({ '/usr/lib64/' + k: '/usr/lib64/' + v for k, v in lib_rename.items() })
-# icu
+for old in ['libasm-0.177.so', 'libdw-0.177.so', 'libelf-0.177.so']:
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.177', '-0.178')
+
+# Fedora has newer glibc
+for old in ['ld-2.30.so', 'libBrokenLocale-2.30.so', 'libanl-2.30.so', 'libc-2.30.so',
+ 'libdl-2.30.so', 'libm-2.30.so',
+ 'libmvec-2.30.so', 'libnsl-2.30.so', 'libnss_compat-2.30.so',
+ 'libnss_db-2.30.so', 'libnss_dns-2.30.so', 'libnss_files-2.30.so',
+ 'libnss_hesiod-2.30.so', 'libpthread-2.30.so', 'libresolv-2.30.so',
+ 'librt-2.30.so', 'libutil-2.30.so']:
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-2.30', '-2.31')
+
+# Fedora has newer icu 65
for old in ['libicudata.so.64', 'libicui18n.so.64', 'libicuio.so.64', 'libicutest.so.64',
'libicutu.so.64', 'libicuuc.so.64']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('so.64', 'so.63')
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('so.64', 'so.65')
include_ignore = {
# Not enabled on Fedora
@@ -274,6 +299,8 @@ pc_ignore = {
ignore.update('/usr/lib64/pkgconfig/' + x for x in pc_ignore)
pc_rename = {
+ 'python-3.7.pc': 'python-3.8.pc',
+ 'python-3.7m.pc': 'python-3.8.pc',
'ruby-2.6.pc': 'ruby.pc',
}
rename.update({ '/usr/lib64/pkgconfig/' + k: '/usr/lib64/pkgconfig/' + v for k, v in pc_rename.items() })
@@ -322,13 +349,15 @@ ignore_patterns = [
ignore_compiled = [re.compile(x) for x in ignore_patterns]
rename_patterns = [
- (r'^/usr/include/c\+\+/9.2.0/(.*)', r'/usr/include/c++/9/\1'),
- (r'^/usr/include/c\+\+/9/x86_64-unknown-linux-gnu/(.*)', r'/usr/include/c++/9/x86_64-redhat-linux/\1'),
+ (r'^/usr/include/c\+\+/9.2.0/(.*)', r'/usr/include/c++/10/\1'),
+ (r'^/usr/include/c\+\+/10/x86_64-unknown-linux-gnu/(.*)', r'/usr/include/c++/10/x86_64-redhat-linux/\1'),
(r'^/usr/include/nss/(.*)', r'/usr/include/nss3/\1'),
+ (r'^/usr/include/python3.7m/(.*)', r'/usr/include/python3.8/\1'),
(r'^/usr/include/ruby-2.6.0/ruby/(.*)', r'/usr/include/ruby/\1'),
(r'^/usr/include/ruby-2.6.0/x86_64-linux/ruby/(.*)', r'/usr/include/ruby/\1'),
(r'^/usr/include/ruby-2.6.0/(.*)', r'/usr/include/ruby/\1'),
(r'^/usr/lib64/pkgconfig/(.*proto.pc)', r'/usr/share/pkgconfig/\1'),
+ (r'^/usr/lib64/python3.7/(.*)', r'/usr/lib64/python3.8/\1'),
(r'^/usr/share/fonts/liberation-fonts/(LiberationMono.*)', r'/usr/share/fonts/liberation-mono/\1'),
(r'^/usr/share/fonts/liberation-fonts/(LiberationSans.*)', r'/usr/share/fonts/liberation-sans/\1'),
(r'^/usr/share/fonts/liberation-fonts/(LiberationSerif.*)', r'/usr/share/fonts/liberation-serif/\1'),
diff --git a/tools/util.py b/tools/util.py
index ca05aca..a58a851 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -7,11 +7,11 @@ import sys
import xml.etree.ElementTree as ET
import xml.sax
-STREAM = 'f31'
+STREAM = 'f32'
ID_PREFIX = 'org.fedoraproject'
# branch of flatpak-rpm-macros and flatpak-runtime-config
-RPM_BRANCH = 'f31'
-DATASET_ARG = '--dataset=f31'
+RPM_BRANCH = 'f32'
+DATASET_ARG = '--dataset=f32'
# If this is True, then we'll use the "base" profiles (freedesktop-based) as the main profiles
BASEONLY = False
@@ -19,7 +19,7 @@ XDG_CACHE_HOME = os.environ.get("XDG_CACHE_HOME") or os.path.expanduser("~/.cach
# This needs to be in sync with fedmod
REPOS = [
- "f31--fedora",
+ "f32--fedora",
]
_log_name = None
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-11 14:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-11 14:41 [flatpaks/flatpak-runtime] f45: Update to F32 and switch to GNOME 3.36 runtime Kalev Lember
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox