public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [flatpaks/flatpak-runtime] f45: Update renames
@ 2026-09-11 14:43 Yaakov Selkowitz
0 siblings, 0 replies; 2+ messages in thread
From: Yaakov Selkowitz @ 2026-09-11 14:43 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : flatpaks/flatpak-runtime
Branch : f45
Commit : ad9e1fbf464bb232aae28ed52fa8ab1d625db8af
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-03-02T21:12:38-05:00
Stats : +36/-11 in 1 file(s)
URL : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/ad9e1fbf464bb232aae28ed52fa8ab1d625db8af?branch=f45
Log:
Update renames
---
diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index 4599e17..03020cc 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -39,11 +39,8 @@ bin_ignore = [
# glibc-utils not packaged in Fedora
'nscd', 'sln', 'trace',
- # GPG test program (https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=tree;f=tests)
- 'gpgscm',
-
- # An implementation of tar for cross-platform compatibility, disabled in gnupg2.spec
- 'gpgtar',
+ # gnupg utilities not packaged in Fedora
+ 'gpg-authcode-sign.sh', 'gpg-mail-tube', 'gpgscm', 'gpgtar',
# gnutls utlilties not packaged in Fedora
'srptool',
@@ -86,6 +83,12 @@ bin_ignore = [
'gss-client', 'gss-server', 'krb5-send-pr', 'sim_client', 'sim_server',
'uuclient', 'uuserver',
+ # pciutils tools not packaged in Fedora
+ 'pcilmr',
+
+ # v4l-utils tools not packaged in Fedora
+ 'decode_tm6000',
+
# Debian login/passwd/util-linux
'expiry', 'faillog', 'logoutd', 'mkfs.bfs',
@@ -201,6 +204,7 @@ lib_rename = {
'libnsl.so.1': 'libnsl.so.3',
'libonig.so.4': 'libonig.so.5',
'libopenh264.so.6': 'libopenh264.so.7',
+ 'libp11.so.2': 'libp11.so.3',
# 'libpcre2-posix.so.3': 'libpcre2-posix.so.3',
'libpython3.12.so.1.0': 'libpython3.13.so.1.0',
'libpython3.12.so': 'libpython3.13.so',
@@ -212,7 +216,7 @@ lib_rename = {
'libvpx.so.8': 'libvpx.so.9',
'libwebrtc_audio_processing.so': 'libwebrtc-audio-processing-1.so',
'libwebrtc_audio_processing.so.1': 'libwebrtc-audio-processing-1.so.3',
- 'libwget.so.1': 'libwget.so.2',
+ 'libwget.so.2': 'libwget.so.3',
'libZXing.so.1': 'libZXing.so.3',
# ffmpeg-free version may be different
@@ -243,9 +247,6 @@ lib_rename = {
'libSDL2_image-2.0.so': 'libSDL2_image.so',
'libSDL2_mixer-2.0.so': 'libSDL2_mixer.so',
'libSDL2_net-2.0.so': 'libSDL2_net.so',
-
- # 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()})
@@ -256,8 +257,8 @@ gcc_libs = [
]
rename.update({'/usr/lib64/' + x: '/usr/lib/gcc/x86_64-redhat-linux/14/' + x for x in gcc_libs})
-for old in ['libasm-0.189.so', 'libdw-0.189.so', 'libelf-0.189.so', 'libdebuginfod-0.189.so']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.189', '-0.191')
+for old in ['libasm-0.191.so', 'libdw-0.191.so', 'libelf-0.191.so', 'libdebuginfod-0.191.so']:
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.191', '-0.192')
# Fedora may have newer icu
for old in ['libicudata.so.75', 'libicui18n.so.75', 'libicuio.so.75', 'libicutest.so.75',
@@ -352,6 +353,11 @@ ignore_patterns = [
# Trimmed from xorg-x11-proto-devel (xorgproto)
r'/usr/include/X11/extensions/applewm.*',
+ # From tdbc, not available in Fedora
+ r'/usr/include/fake(mysql|pq|sql).h',
+ r'/usr/include/(mysql|odbc|pq|sql)Stubs.h',
+ r'/usr/include/tdbc.*.h',
+
# From NSPR, intentionally not installed on Fedora
r'/usr/include/md/.*',
@@ -368,6 +374,10 @@ ignore_patterns = [
# Headers moved in webrtc-audio-processing-1.3
r'/usr/include/webrtc_audio_processing/.*',
+ # Arch-specific paths
+ r'/usr/include/.*-linux-gnu',
+ r'/usr/lib64/ld-linux.*',
+
# Trimmed from Fedora perl packages, or pull -devel into platform
r'/usr/lib64/perl5.*/.packlist',
r'/usr/lib64/perl5/[\d.]+/ExtUtils/MakeMaker/Locale\.pm',
@@ -382,6 +392,19 @@ ignore_patterns = [
r'/usr/lib64/python[\d.]+/site-packages/Cython/(Plex/Timing|Plex/Traditional)\.py',
r'/usr/lib64/python[\d.]+/site-packages/Cython/Utility/Capsule\.c',
+ # Dropped in Python 3.13
+ r'/usr/lib64/python[\d.]+/(aifc|cgi|cgitb|chunk|crypt|imghdr|mailcap|nntplib|pipes|sndhdr|sunau|telnetlib|uu|xdrlib)\.py',
+ r'/usr/lib64/python[\d.]+/encodings/.*',
+ r'/usr/lib64/python[\d.]+/lib2to3/.*',
+ r'/usr/lib64/python[\d.]+/lib-dynload/(_crypt|_xxinterpchannels|_xxsubinterpreters|audioop|ossaudiodev|spwd)\.cpython-.*',
+ r'/usr/lib64/python[\d.]+/tkinter/tix\.py',
+ r'/usr/lib64/python[\d.]+/site-packages/pkg_resources/tests/.*',
+ r'/usr/lib64/python[\d.]+/site-packages/setuptools/_distutils/tests/.*',
+ r'/usr/lib64/python[\d.]+/site-packages/setuptools/tests/.*',
+
+ # System fonts are used in gi-docgen
+ r'/usr/lib64/python[\d.]+/site-packages/gidocgen/templates/basic/.*.woff2?',
+
# Qt private API headers, micro version will not always align
r'/usr/include/Qt.*/[\d.]+/Qt.*',
@@ -448,6 +471,7 @@ rename_patterns = [
(r'^/usr/lib64/GL/default/lib/(.*)', r'/usr/lib64/\1'),
(r'^/usr/lib64/GL/default/share/clc/(.*)', r'/usr/lib64/clc/\1'),
(r'^/usr/lib64/GL/default/share/(.*)', r'/usr/share/\1'),
+ (r'^(/usr/lib64/gdk-pixbuf-2.0/.*)/libpixbufloader-svg.so', r'\1/libpixbufloader_svg.so'),
(r'^/usr/lib64/gstreamer-1.0/(gst-.*)', r'/usr/libexec/gstreamer-1.0/\1'),
(r'^/usr/lib64/perl5/site_perl/[\d.]+/x86_64-linux/(.*)', r'/usr/lib64/perl5/\1'),
(r'^/usr/lib64/perl5/site_perl/[\d.]+/(.*)', r'/usr/lib64/perl5/\1'),
@@ -457,6 +481,7 @@ rename_patterns = [
(r'^/usr/lib64/perl5/[\d.]+/(.*)', r'/usr/lib64/perl5/\1'),
(r'^/usr/lib64/pkgconfig/(.*proto.pc)', r'/usr/share/pkgconfig/\1'),
(r'^/usr/lib64/pkgconfig/ruby-[\d\.]*.pc', r'/usr/lib64/pkgconfig/ruby.pc'),
+ (r'^/usr/lib64/python3.12/(pathlib|sysconfig).py', r'/usr/lib64/python3.13/\1/__init__.py'),
(r'^/usr/lib64/python3.12/(site-packages/_dbus.*).cpython-312-.*', r'/usr/lib64/python3.13/\1.so'),
(r'^/usr/lib64/python3.12/(.*).cpython-312-(.*)', r'/usr/lib64/python3.13/\1.cpython-313-\2'),
(r'^/usr/lib64/python3.12/(.*)', r'/usr/lib64/python3.13/\1'),
^ permalink raw reply related [flat|nested] 2+ messages in thread* [flatpaks/flatpak-runtime] f45: Update renames
@ 2026-09-11 14:43 Yaakov Selkowitz
0 siblings, 0 replies; 2+ messages in thread
From: Yaakov Selkowitz @ 2026-09-11 14:43 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : flatpaks/flatpak-runtime
Branch : f45
Commit : ebcba52447c10c3862bb20121b8265c96a0c3750
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-03-02T21:12:38-05:00
Stats : +26/-19 in 1 file(s)
URL : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/ebcba52447c10c3862bb20121b8265c96a0c3750?branch=f45
Log:
Update renames
---
diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index 7db5023..7175e8e 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -151,7 +151,7 @@ lib_ignore = [
'libapparmor.so', 'libapparmor.so.1',
# binutils internal libraries
- 'libbfd-2.42.so', 'libopcodes-2.42.so', 'libgprofng.so', 'libgprofng.so.0',
+ 'libbfd-2.43.1.so', 'libopcodes-2.43.1.so', 'libgprofng.so', 'libgprofng.so.0',
# Trimmed from gettext(-devel)
'libgettextlib.so', 'libgettextsrc.so', 'libtextstyle.so', 'libtextstyle.so.0',
@@ -163,8 +163,9 @@ lib_ignore = [
'libc_malloc_debug.so', 'libssp.so.0',
# glslang is built as static libraries only
- 'libHLSL.so.12', 'libHLSL.so', 'libSPIRV.so.12', 'libSPIRV.so',
- 'libSPVRemapper.so.12', 'libSPVRemapper.so', 'libglslang.so.12', 'libglslang.so',
+ 'libHLSL.so.14', 'libHLSL.so', 'libSPIRV.so.14', 'libSPIRV.so',
+ 'libSPVRemapper.so.14', 'libSPVRemapper.so', 'libglslang.so.14', 'libglslang.so',
+ 'libglslang-default-resource-limits.so.14', 'libglslang-default-resource-limits.so',
# Disabled in libunwind
'libunwind-ptrace.so', 'libunwind-ptrace.so.0',
@@ -175,7 +176,8 @@ ignore.update('/usr/lib64/' + x for x in lib_ignore)
lib_rename = {
# Older in Fedora
# 'libabigail.so.4': 'libabigail.so.3',
- 'libpkgconf.so.5': 'libpkgconf.so.4',
+ 'libassuan.so.9': 'libassuan.so.0',
+# 'libpkgconf.so.5': 'libpkgconf.so.5',
# 'libsframe.so.1': 'libsframe.so.0',
# 'libtiff.so.6': 'libtiff.so.5',
# 'libtiffxx.so.6': 'libtiffxx.so.5',
@@ -184,14 +186,7 @@ lib_rename = {
# 'libaom.so.3': 'libaom.so.3',
'libappstream.so.4': 'libappstream.so.5',
# 'libasan.so.8': 'libasan.so.8',
-# 'libavcodec.so.60': 'libavcodec.so.60',
-# 'libavdevice.so.60': 'libavdevice.so.60',
-# 'libavfilter.so.9': 'libavfilter.so.9',
-# 'libavformat.so.60': 'libavformat.so.60',
-# 'libavutil.so.58': 'libavutil.so.58',
'libavif.so.15': 'libavif.so.16',
- 'libclang-cpp.so.17': 'libclang-cpp.so.19.1',
- 'libclang.so.17': 'libclang.so.19.1',
'libdav1d.so.6': 'libdav1d.so.7',
# 'libffi.so.8': 'libffi.so.8',
# 'libFLAC++.so.10': 'libFLAC++.so.10',
@@ -202,9 +197,6 @@ lib_rename = {
# 'libkadm5clnt_mit.so.12': 'libkadm5clnt_mit.so.12',
# 'libkadm5srv_mit.so.12': 'libkadm5srv_mit.so.12',
# 'libkdb5.so.10': 'libkdb5.so.10',
- 'libLLVM-17.so': 'libLLVM-19.so',
- 'libLLVMSPIRVLib.so.17': 'libLLVMSPIRVLib.so.19.1',
- 'libLTO.so.17': 'libLTO.so.19.1',
# 'libmozjs-115.so': 'libmozjs-115.so',
'libnsl.so.1': 'libnsl.so.3',
'libonig.so.4': 'libonig.so.5',
@@ -212,9 +204,7 @@ lib_rename = {
# 'libpcre2-posix.so.3': 'libpcre2-posix.so.3',
'libpython3.12.so.1.0': 'libpython3.13.so.1.0',
'libpython3.12.so': 'libpython3.13.so',
- 'libRemarks.so.17': 'libRemarks.so.19.1',
# 'libsepol.so.2': 'libsepol.so.2',
-# 'libswscale.so.7': 'libswscale.so.7',
# 'libunistring.so.5': 'libunistring.so.5',
# 'libvala-0.56.so': 'libvala-0.56.so',
# 'libvala-0.56.so.0': 'libvala-0.56.so.0',
@@ -225,6 +215,23 @@ lib_rename = {
'libwget.so.1': 'libwget.so.2',
'libZXing.so.1': 'libZXing.so.3',
+ # ffmpeg-free version may be different
+ 'libavcodec.so.60': 'libavcodec.so.61',
+ 'libavdevice.so.60': 'libavdevice.so.61',
+ 'libavfilter.so.9': 'libavfilter.so.10',
+ 'libavformat.so.60': 'libavformat.so.61',
+ 'libavutil.so.58': 'libavutil.so.59',
+ 'libswresample.so.4': 'libswresample.so.5',
+ 'libswscale.so.7': 'libswscale.so.8',
+
+ # LLVM/Clang version is usually different
+ 'libclang-cpp.so.17': 'libclang-cpp.so.19.1',
+ 'libclang.so.17': 'libclang.so.19.1',
+ 'libLLVM-17.so': 'libLLVM-19.so',
+ 'libLLVMSPIRVLib.so.17': 'libLLVMSPIRVLib.so.19.1',
+ 'libLTO.so.17': 'libLTO.so.19.1',
+ 'libRemarks.so.17': 'libRemarks.so.19.1',
+
# Replaced by libxcrypt in Fedora
'libcrypt.so.1': 'libcrypt.so.2',
@@ -253,9 +260,9 @@ for old in ['libasm-0.189.so', 'libdw-0.189.so', 'libelf-0.189.so', 'libdebuginf
rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('-0.189', '-0.191')
# Fedora may have newer icu
-for old in ['libicudata.so.73', 'libicui18n.so.73', 'libicuio.so.73', 'libicutest.so.73',
- 'libicutu.so.73', 'libicuuc.so.73']:
- rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('so.73', 'so.74')
+for old in ['libicudata.so.75', 'libicui18n.so.75', 'libicuio.so.75', 'libicutest.so.75',
+ 'libicutu.so.75', 'libicuuc.so.75']:
+ rename['/usr/lib64/' + old] = '/usr/lib64/' + old.replace('so.75', 'so.74')
include_rename = {
'asoundlib.h': 'alsa/asoundlib.h',
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-09-11 14:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-11 14:43 [flatpaks/flatpak-runtime] f45: Update renames Yaakov Selkowitz
-- strict thread matches above, loose matches on Subject: below --
2026-09-11 14:43 Yaakov Selkowitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox