From c4fadb252db9ad6af77b65a70841f618a6dc34f2 Mon Sep 17 00:00:00 2001 From: Silvan Date: Sat, 19 Aug 2023 19:59:12 +0200 Subject: [PATCH] 04-rpmbuild-format-unpackaged-filelist: support for recent python versions, systemd and pam --- ...4-rpmbuild-format-unpackaged-filelist.conf | 75 ++++++++++--------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/conf/04-rpmbuild-format-unpackaged-filelist.conf b/conf/04-rpmbuild-format-unpackaged-filelist.conf index c28fbed..06714e6 100644 --- a/conf/04-rpmbuild-format-unpackaged-filelist.conf +++ b/conf/04-rpmbuild-format-unpackaged-filelist.conf @@ -7,6 +7,31 @@ s,^/usr/include/python3.3m,%{python3_inc}, s,^/usr/include/KF5,%{_kde5_includedir}, s,^/usr/share/kf5,%{_kde5_datadir}/kf5, s,^/usr/share/kservicetypes5,%{_kde5_servicetypesdir}, +# systemd +s,^/usr/lib/systemd/system,%{_unitdir}, +s,^/usr/lib/systemd/user,%{_userunitdir}, +s,^/usr/lib/systemd/system-preset,%{_presetdir}, +s,^/usr/lib/systemd/user-preset,%{_userpresetdir}, +s,^/usr/lib/systemd,%{_systemd_util_dir}, +s,^/usr/lib/udev/hwdb.d,%{_udevhwdbdir}, +s,^/usr/lib/udev/rules.d,%{_udevrulesdir}, +s,^/usr/lib/systemd/catalog,%{_journalcatalogdir}, +s,^/usr/lib/binfmt.d,%{_binfmtdir}, +s,^/usr/lib/sysctl.d,%{_sysctldir}, +s,^/usr/lib/sysusers.d,%{_sysusersdir}, +s,^/usr/lib/tmpfiles.d,%{_tmpfilesdir}, +s,^/usr/share/user-tmpfiles.d,%{_user_tmpfilesdir}, +s,^/usr/lib/environment.d,%{_environmentdir}, +s,^/usr/lib/modules-load.d,%{_modulesloaddir}, +s,^/usr/lib/modprobe.d,%{_modprobedir}, +s,^/usr/lib/systemd/system-generators,%{_systemdgeneratordir}, +s,^/usr/lib/systemd/user-generators,%{_systemdusergeneratordir}, +s,^/usr/lib/systemd/system-environment-generators,%{_systemd_system_env_generator_dir}, +s,^/usr/lib/systemd/user-environment-generators,%{_systemd_user_env_generator_dir}, +# pam +s,^/etc/security,%{_pam_secconfdir}, +s,^/etc/pam.d,%{_pam_confdir}, +s,^/usr/share/pam.d,%{_pam_vendordir}, # generic translations s,^/usr/bin,%{_bindir}, s,^/usr/sbin,%{_sbindir}, @@ -16,49 +41,23 @@ s,^/usr/share,%{_datadir}, s,^/usr/include,%{_includedir}, s,^/etc,%{_sysconfdir}, s,^/var,%{_localstatedir}, -# kde4 -s,^/etc/opt/kde,%{_kde4_sysconfdir}, -s,^/opt/kde/bin,%{_kde4_bindir}, -s,^/opt/kde/sbin,%{_kde4_sbindir}, -s,^/opt/kde/include,%{_kde4_includedir}, -s,^/opt/kde/share/applications,%{_kde4_xdgappsdir}, -s,^/opt/kde/share/apps/kconf_update,%{_kde4_kconfupdatedir}, -s,^/opt/kde/share/apps,%{_kde4_datadir}, -s,^/opt/kde/share/autostart,%{_kde4_autostartdir}, -s,^/opt/kde/share/config.kcfg,%{_kde4_kcfgdir}, -s,^/opt/kde/share/config,%config %{_kde4_configdir}, -s,^/opt/kde/share/dbus-1/interfaces,%{_kde4_dbusinterfacesdir}, -s,^/opt/kde/share/dbus-1/services,%{_kde4_dbusservicesdir}, -s,^/opt/kde/share/desktop-directories,%{_kde4_xdgdirectorydir}, -s,^/opt/kde/share/doc/HTML/en,%doc %lang(en) %{_kde4_htmldir}/en, -s,^/opt/kde/share/doc/HTML,%{_kde4_htmldir}, -s,^/usr/share/icons,%{_kde4_icondir}, -s,^/opt/kde/share/kde4/services,%{_kde4_servicesdir}, -s,^/opt/kde/share/kde4/servicetypes,%{_kde4_servicetypesdir}, -s,^/opt/kde/share/locale,%{_kde4_localedir}, -s,^/opt/kde/share/mime/packages,%{_kde4_xdgmimedir}, -s,^/opt/kde/share/mimelnk,%{_kde4_mimedir}, -s,^/opt/kde/share/sounds,%{_kde4_soundsdir}, -s,^/opt/kde/share/templates,%{_kde4_templatesdir}, -s,^/opt/kde/share/wallpapers,%{_kde4_wallpaperdir}, -s,^/opt/kde/share,%{_kde4_sharedir}, " ## conversion rules which are (target) architecture specific ### i586 format_unpackaged_file_list_i586="\ -# kde4 -s,^/opt/kde/lib/kde4/libexec,%{_kde4_libexecdir}, -s,^/opt/kde/lib/kde4/plugins,%{_kde4_pluginsdir}, -s,^/opt/kde/lib,%{_kde4_libdir}, # kde5 s,^/usr/lib/cmake/KF5,%{_kde5_libdir}/cmake/KF5, s,^/usr/lib/libKF5,%{_kde5_libdir}/libKF5, s,^/usr/lib/qt5/mkspecs/modules/qt_K,%{_kde5_mkspecsdir}/qt_K, # python s,^/usr/lib/python2.7/site-packages,%{python27_sitearch}, -s,^/usr/lib/python3.3/site-packages,%{python3_sitearch}, +s,^/usr/lib/python3.7/site-packages,%{python3_sitearch}, +s,^/usr/lib/python3.10/site-packages,%{python310_sitearch}, +s,^/usr/lib/python3.11/site-packages,%{python311_sitearch}, +# pam +s,^/usr/lib/security,%{_pam_moduledir}, # libraries s,^/usr/libexec,%{_libexecdir}, s,^/usr/lib,%{_libdir}, @@ -69,10 +68,6 @@ format_unpackaged_file_list_arm="$format_unpackaged_file_list_i586" ### x86_64 format_unpackaged_file_list_x86_64="\ -# kde4 -s,^/opt/kde/lib64/kde4/libexec,%{_kde4_libexecdir}, -s,^/opt/kde/lib64/kde4/plugins,%{_kde4_pluginsdir}, -s,^/opt/kde/lib64,%{_kde4_libdir}, # kde5 s,^/usr/lib64/cmake/KF5,%{_kde5_libdir}/cmake/KF5, s,^/usr/lib64/libKF5,%{_kde5_libdir}/libKF5, @@ -80,8 +75,14 @@ s,^/usr/lib64/qt5/mkspecs/modules/qt_K,%{_kde5_mkspecsdir}/qt_K, # python s,^/usr/lib64/python2.7/site-packages,%{python27_sitearch}, s,^/usr/lib/python2.7/site-packages,%{python27_sitelib}, -s,^/usr/lib64/python3.3/site-packages,%{python3_sitearch}, -s,^/usr/lib/python3.3/site-packages,%{python3_sitelib}, +s,^/usr/lib64/python3.7/site-packages,%{python3_sitearch}, +s,^/usr/lib/python3.7/site-packages,%{python3_sitelib}, +s,^/usr/lib64/python3.10/site-packages,%{python310_sitearch}, +s,^/usr/lib/python3.10/site-packages,%{python310_sitelib}, +s,^/usr/lib64/python3.11/site-packages,%{python311_sitearch}, +s,^/usr/lib/python3.11/site-packages,%{python311_sitelib}, +# pam +s,^/usr/lib64/security,%{_pam_moduledir}, # libraries s,^/usr/libexec64,%{_libexecdir}, s,^/usr/libexec,%{_prefix}/libexec,