public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [flatpaks/flatpak-runtime] f45: Update renames
Date: Fri, 11 Sep 2026 14:43:18 GMT	[thread overview]
Message-ID: <178913779861.1.3763342176823246012.flatpaks-flatpak-runtime-ad9e1fbf464b@fedoraproject.org> (raw)

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'),

             reply	other threads:[~2026-09-11 14:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-11 14:43 Yaakov Selkowitz [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-09-11 14:43 [flatpaks/flatpak-runtime] f45: Update renames Yaakov Selkowitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178913779861.1.3763342176823246012.flatpaks-flatpak-runtime-ad9e1fbf464b@fedoraproject.org \
    --to=yselkowi@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox