[rpms/flatpak-runtime-config] f45: Add file triggers from glibc, glib2, and fontconfig

[rpms/flatpak-runtime-config] f45: Add file triggers from glibc, glib2, and fontconfig

[Owen W. Taylor]

A new commit has been pushed.

Repo   : rpms/flatpak-runtime-config
Branch : f45
Commit : 628473497ed97f54c2e07533f8c11e0aa35ac388
Author : Owen W. Taylor <otaylor@fishsoup.net>
Date   : 2018-09-08T00:19:48-04:00
Stats  : +25/-7 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/flatpak-runtime-config/c/628473497ed97f54c2e07533f8c11e0aa35ac388?branch=f45

Log:
Add file triggers from glibc, glib2, and fontconfig

---
diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec
index 282955e..62b5dea 100644
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@@ -1,6 +1,6 @@
 Name:           flatpak-runtime-config
-Version:        27
-Release:        7%{?dist}
+Version:        29
+Release:        1%{?dist}
 Summary:        Configuration files that live inside the flatpak runtime
 Source1:        50-flatpak.conf
 
@@ -29,18 +29,36 @@ echo "/app/%{_lib}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/app.conf
 
 %post -p /sbin/ldconfig
 
+# We duplicate selected file triggers from packages in the runtime, to
+# extend them to cover /app as well. Some other functions that RPM file
+# triggers normally provide are handled by flatpak triggers - in particular
+# calling update-desktop-database and gtk-update-icon-cache.
+
+# From glibc - this has a limited function since symlinks are supposed to be
+# packaged, and a ld.so.cache that handles both /app and /usr is maintained
+# by flatpak. But occasionally a symlink is missed in packaging, and this
+# will make sure it is created install time, as it would be system-wide.
+%transfiletriggerin -P 1999999 -- /app/lib /app/lib64
+/sbin/ldconfig
+
+# From glib2
+%transfiletriggerin -- /app/glib-2.0/schemas
+glib-compile-schemas /app/glib-2.0/schemas &> /dev/null || :
+
+# From fontconfig
+%transfiletriggerin -- /app/share/fonts
+HOME=/root /usr/bin/fc-cache -s
+
 %files
 %dir %{_prefix}/cache
 %dir %{_prefix}/cache/fontconfig
 %{_sysconfdir}/fonts/conf.d/*
-# Note that this is necessary at build time but has no effect during flatpak
-# execution, since /etc/ld.so.cache will only contain the libraries from
-# the runtime and not any libraries that are separately mounted in /app/lib[64].
-# During flatpak execution LD_LIBRARY_PATH is used to find the libraries from
-# /app/lib[64].
 %{_sysconfdir}/ld.so.conf.d/app.conf
 
 %changelog
+* Sat Sep  8 2018 Owen Taylor <otaylor@redhat.com> - 29-1
+- Add file triggers from glibc, glib2, and fontconfig
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 27-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild