diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec index 96bd386..254f9eb 100644 --- a/flatpak-runtime-config.spec +++ b/flatpak-runtime-config.spec @@ -4,7 +4,7 @@ Name: flatpak-runtime-config Version: 41 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Configuration files that live inside the flatpak runtime Source1: 50-flatpak.conf Source2: sitecustomize.py @@ -67,7 +67,13 @@ sed -e 's|%%{_libdir}|%{_libdir}|' \ %{SOURCE3} > $RPM_BUILD_ROOT%{_sysconfdir}/flatpak-builder/defaults.json mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ -echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf +cat > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf <<_EOF +include /run/flatpak/ld.so.conf.d/app-*.conf +include /app/etc/ld.so.conf +include /app/etc/ld.so.conf.d/*.conf +/app/%{_lib} +include /run/flatpak/ld.so.conf.d/runtime-*.conf +_EOF # We duplicate selected file triggers from packages in the runtime, to # extend them to cover /app as well. Some other functions that RPM file @@ -82,7 +88,7 @@ echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf %post -p /sbin/ldconfig -%transfiletriggerin -P 1999999 -- /app/lib /app/lib64 +%transfiletriggerin -P 1999999 -- /app/lib /app/lib64 /app/etc/ld.so.conf.d /sbin/ldconfig %transfiletriggerin -- /app/share/glib-2.0/schemas @@ -110,6 +116,9 @@ done %{_sysconfdir}/ld.so.conf.d/app.conf %changelog +* Tue Dec 10 2024 Yaakov Selkowitz - 41-2 +- Enable dynamic ld.so.cache generation + * Thu Aug 15 2024 Yaakov Selkowitz - 41-1 - Bump version