[flatpaks/flatpak-runtime] f45: Map Cantarell fonts to their Fedora location

[flatpaks/flatpak-runtime] f45: Map Cantarell fonts to their Fedora location

[Owen W. Taylor]

A new commit has been pushed.

Repo   : flatpaks/flatpak-runtime
Branch : f45
Commit : d14eb35714ea9d000490480ad92fd99c631c59f6
Author : Owen W. Taylor <otaylor@fishsoup.net>
Date   : 2018-02-01T15:09:56-05:00
Stats  : +3/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/d14eb35714ea9d000490480ad92fd99c631c59f6?branch=f45

Log:
Map Cantarell fonts to their Fedora location

---
diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index 048691e..35c1fa8 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -18,6 +18,7 @@ data:
   profiles:
     runtime:
       rpms:
+      - abattis-cantarell-fonts
       - acl
       - libacl
       - adwaita-cursor-theme
@@ -799,6 +800,7 @@ data:
       - zlib
     sdk:
       rpms:
+      - abattis-cantarell-fonts
       - acl
       - libacl
       - libacl-devel

diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index de5631f..b1c4abd 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -263,6 +263,7 @@ rename_patterns = [
     (r'^/usr/include/python3.5m/(.*)', r'/usr/include/python3.6m/\1'),
     (r'^/usr/lib64/pkgconfig/(.*proto.pc)', r'/usr/share/pkgconfig/\1'),
     (r'^/usr/share/fonts/liberation-fonts/(.*)', r'/usr/share/fonts/liberation/\1'),
+    (r'^/usr/share/fonts/cantarell/(.*)', r'/usr/share/fonts/abattis-cantarell/\1'),
 ]
 rename_compiled = [(re.compile(a), b) for a, b in rename_patterns]