[rpms/flatpak-runtime-config] f45: Update font config to match freedesktop-sdk

[rpms/flatpak-runtime-config] f45: Update font config to match freedesktop-sdk

[Mark Otaris]

            A new commit has been pushed.

            Repo   : rpms/flatpak-runtime-config
            Branch : f45
            Commit : 27155327b89acdf549c1c8b7d664faef2bcc4e8a
            Author : Mark Otaris <mark@net-c.com>
            Date   : 2019-07-25T23:33:45-04:00
            Stats  : +17/-2 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/flatpak-runtime-config/c/27155327b89acdf549c1c8b7d664faef2bcc4e8a?branch=f45

            Log:
            Update font config to match freedesktop-sdk

This is necessary for custom user fonts to work.

---
diff --git a/50-flatpak.conf b/50-flatpak.conf
index 03c629d..f66c44c 100644
--- a/50-flatpak.conf
+++ b/50-flatpak.conf
@@ -1,3 +1,6 @@
+<!-- This should be kept in sync with changes to
+     https://gitlab.com/freedesktop-sdk/freedesktop-sdk/blob/master/files/fontconfig-flatpak.conf
+     from the Freedesktop runtimes. -->
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
@@ -9,4 +12,13 @@
         <include ignore_missing="yes">/app/etc/fonts/local.conf</include>
 
         <dir>/run/host/fonts</dir>
+        <dir>/run/host/user-fonts</dir>
+
+        <!-- This is duplicated from the general config because we want to write there
+             before the /run dirs, in case they are ever writable, like e.g with old
+             versions of flatpak. -->
+        <cachedir prefix="xdg">fontconfig</cachedir>
+
+        <cachedir>/run/host/fonts-cache</cachedir>
+        <cachedir>/run/host/user-fonts-cache</cachedir>
 </fontconfig>

diff --git a/flatpak-runtime-config.spec b/flatpak-runtime-config.spec
index 6a3be18..66a564a 100644
--- a/flatpak-runtime-config.spec
+++ b/flatpak-runtime-config.spec
@@ -1,6 +1,6 @@
 Name:           flatpak-runtime-config
-Version:        29
-Release:        6%{?dist}
+Version:        30
+Release:        1%{?dist}
 Summary:        Configuration files that live inside the flatpak runtime
 Source1:        50-flatpak.conf
 Source2:        usercustomize.py
@@ -70,6 +70,9 @@ HOME=/root /usr/bin/fc-cache -s
 %{_sysconfdir}/ld.so.conf.d/app.conf
 
 %changelog
+* Fri Jul 26 2019 Mark Otaris <mark@net-c.com> - 30-1
+- Update font config to match freedesktop-sdk, allowing user-installed fonts to work
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 29-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild