[flatpaks/flatpak-runtime] f45: resolve-files.py: Add back abattis-cantarell-fonts

[flatpaks/flatpak-runtime] f45: resolve-files.py: Add back abattis-cantarell-fonts

[Kalev Lember]

            A new commit has been pushed.

            Repo   : flatpaks/flatpak-runtime
            Branch : f45
            Commit : 21220cf92e291cc98cb937aad929dddeffef4533
            Author : Kalev Lember <klember@redhat.com>
            Date   : 2022-09-07T21:56:20+02:00
            Stats  : +3/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/21220cf92e291cc98cb937aad929dddeffef4533?branch=f45

            Log:
            resolve-files.py: Add back abattis-cantarell-fonts

It inadvertently dropped out during F36 runtime branching.

---
diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index ad99f84..0564e1a 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -18,6 +18,7 @@ data:
   profiles:
     runtime:
       rpms:
+      - abattis-cantarell-fonts
       - acl
       - adobe-source-code-pro-fonts
       - adwaita-cursor-theme
@@ -1201,6 +1202,7 @@ data:
       - svt-av1-libs
     sdk:
       rpms:
+      - abattis-cantarell-fonts
       - acl
       - adobe-mappings-cmap
       - adobe-mappings-cmap-deprecated

diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index 094f9c5..72a7137 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -383,6 +383,7 @@ rename_patterns = [
     (r'^/usr/lib64/GL/default/lib/dri/(.*)', r'/usr/lib64/dri/\1'),
     (r'^/usr/lib64/pkgconfig/(.*proto.pc)', r'/usr/share/pkgconfig/\1'),
     (r'^/usr/lib64/python3.9/(.*)', r'/usr/lib64/python3.11/\1'),
+    (r'^/usr/share/fonts/cantarell/Cantarell-VF.otf', r'/usr/share/fonts/abattis-cantarell-fonts/Cantarell-Regular.otf'),
     (r'^/usr/share/fonts/dejavu/(DejaVuSansMono.*)', r'/usr/share/fonts/dejavu-sans-mono-fonts/\1'),
     (r'^/usr/share/fonts/dejavu/(DejaVuSans.*)', r'/usr/share/fonts/dejavu-sans-fonts/\1'),
     (r'^/usr/share/fonts/dejavu/(DejaVuMath.*)', r'/usr/share/fonts/dejavu-serif-fonts/\1'),