[flatpaks/flatpak-runtime] f45: Refine git subpackage inclusion

[flatpaks/flatpak-runtime] f45: Refine git subpackage inclusion

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : flatpaks/flatpak-runtime
            Branch : f45
            Commit : 9bf15f896f98a836bf3c0a96e1b39217a94d703b
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-05-17T19:09:36-04:00
            Stats  : +17/-8 in 4 file(s)
            URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/9bf15f896f98a836bf3c0a96e1b39217a94d703b?branch=f45

            Log:
            Refine git subpackage inclusion

https://src.fedoraproject.org/rpms/git/c/41a5fe7539d119c194e4979bee0fd9fbf14ada3c
would result in many git subpackages being dropped.  This searches
/usr/libexec for files to match, while filtering those git subpackages
(and some -tests) and their dependencies which are not wanted.

---
diff --git a/container-sdk.yaml b/container-sdk.yaml
index 5d12da5..ba8462b 100644
--- a/container-sdk.yaml
+++ b/container-sdk.yaml
@@ -303,8 +303,6 @@ flatpak:
     - cups-filesystem
     - cups-libs
     - curl
-    - cvs
-    - cvsps
     - cyrus-sasl
     - cyrus-sasl-devel
     - cyrus-sasl-gssapi
@@ -415,7 +413,9 @@ flatpak:
     - gcc-gdb-plugin
     - gcc-gfortran
     - gcc-objc
+    - gcc-objc++
     - gcc-plugin-annobin
+    - gcc-plugin-devel
     - gcr-devel
     - gcr-libs
     - gd
@@ -443,7 +443,6 @@ flatpak:
     - git
     - git-core
     - git-core-doc
-    - git-cvs
     - git-lfs
     - gjs
     - gjs-devel
@@ -809,6 +808,7 @@ flatpak:
     - libmount
     - libmount-devel
     - libmpc
+    - libmpc-devel
     - libmysofa
     - libmysofa-devel
     - libnghttp2
@@ -1144,6 +1144,7 @@ flatpak:
     - opensp
     - openssh
     - openssh-clients
+    - openssh-keysign
     - openssl
     - openssl-devel
     - openssl-devel-engine
@@ -1210,8 +1211,6 @@ flatpak:
     - perl-Data-OptList
     - perl-Data-Section
     - perl-DB_File
-    - perl-DBD-SQLite
-    - perl-DBI
     - perl-DBM_Filter
     - perl-debugger
     - perl-deprecate
@@ -1651,9 +1650,7 @@ flatpak:
     - valgrind-scripts
     - valgrind-tools-devel
     - vid.stab
-    - vim-data
     - vim-filesystem
-    - vim-minimal
     - vo-amrwbenc
     - vulkan-headers
     - vulkan-loader

diff --git a/container.yaml b/container.yaml
index be6cdcb..b7acc70 100644
--- a/container.yaml
+++ b/container.yaml
@@ -695,6 +695,7 @@ flatpak:
     - openpgm
     - openssh
     - openssh-clients
+    - openssh-keysign
     - openssl-libs
     - opus
     - opusfile

diff --git a/tools/list-files.py b/tools/list-files.py
index 1f5ce0c..1ed85e4 100755
--- a/tools/list-files.py
+++ b/tools/list-files.py
@@ -21,6 +21,7 @@ def output_dir_recurse(d):
             print(os.path.join(dirName, f))
 
 output_dir('/usr/bin')
+output_dir_recurse('/usr/libexec/')
 
 python_dirs = []
 for d in ['/usr/lib', '/usr/lib/x86_64-linux-gnu']:

diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index 6b6a6b5..7490c21 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -51,6 +51,9 @@ bin_ignore = [
     # gstreamer1 utilities not packaged in Fedora
     'gst-tester-1.0', 'playout',
 
+    # packaged in gtksourceview5-tests
+    'gtksourceview5-widget',
+
     # kf5-*/phonon-qt5 in <=39, kf6-*/phonon-qt6 in >=40
     'kde-geo-uri-handler', 'kwalletd5', 'kwalletd6', 'kwallet-query', 'phononsettings',
 
@@ -408,6 +411,9 @@ ignore_patterns = [
     # fcitx
     r'/usr/lib64/libfcitx.*',
 
+    # installed tests from GLib-based libraries
+    r'^/usr/libexec/installed-tests/.*',
+
     # .install files litter the include directories of openembedded
     r'.*/\.install$',
 
@@ -464,6 +470,8 @@ rename_patterns = [
     (r'^/usr/lib64/python3.13/(.*).cpython-313-(.*)', r'/usr/lib64/python3.14/\1.cpython-314-\2'),
     (r'^/usr/lib64/python3.13/(.*)', r'/usr/lib64/python3.14/\1'),
     (r'^/usr/lib64/(v4l[12].*.so)', r'/usr/lib64/libv4l/\1'),
+    (r'^/usr/libexec/(ssh-.*)', r'/usr/libexec/openssh/\1'),
+    (r'^/usr/libexec/gcc/x86_64-unknown-linux-gnu/[\d\.]*/(.*)', r'/usr/libexec/gcc/x86_64-redhat-linux/16/\1'),
     (r'^/usr/share/fonts/Adwaita/(AdwaitaMono.*)', r'/usr/share/fonts/adwaita-mono-fonts/\1'),
     (r'^/usr/share/fonts/Adwaita/(AdwaitaSans.*)', r'/usr/share/fonts/adwaita-sans-fonts/\1'),
     (r'^/usr/share/fonts/cantarell/(Cantarell-VF.otf)', r'/usr/share/fonts/abattis-cantarell-vf-fonts/\1'),
@@ -516,6 +524,7 @@ global_package_ignore_patterns = [
     '^kbd-legacy$',
     '^kbd-misc$',
     '^keyutils$',
+    r'^kf[\d]+-kwallet$',
     '^kmod$',
     '^kmod-devel$',
     '^krb5-server$',
@@ -526,6 +535,7 @@ global_package_ignore_patterns = [
     '^lvm2.*$',
     '^nscd$',
     '^openresolv$',
+    '^p11-kit-server$',
     '^pam$',
     '^passwd$',
     '^pipewire$',
@@ -570,11 +580,11 @@ global_package_ignore_patterns = [
     '^gdbm$',
     '^gdk-pixbuf2-modules.*',
     '^giflib-utils$',
+    r'^git-(cvs|daemon|email|instaweb|p4|svn)$',
     '^gitk$',
     '^glibc-utils$',
     '^gstreamer1-plugins-base-tools$',
     '^gstreamer1-plugins-ugly.*',
-    '^gtksourceview5-tests$',
     '^idn2$',
     '^itcl$',
     '^itcl-devel$',