From a34f990883664ca1979a9c14ac11f4b25cfda226 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Jan 26 2022 07:42:13 +0000
Subject: Add a sub-package for variable font, abattis-cantarell-vf-fonts.


  Resolves: rhbz#2045012
Convert the spec file to the latest font packaging guidelines.

---

diff --git a/31-cantarell-vf.conf b/31-cantarell-vf.conf
new file mode 100644
index 0000000..bbc8600
--- /dev/null
+++ b/31-cantarell-vf.conf
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<!--
+
+     Define aliasing and other fontconfig settings for Cantarell.
+
+-->
+<fontconfig>
+  <!-- Font substitution -->
+  <alias binding="same">
+    <family>system-ui</family>
+    <accept>
+      <family>Cantarell</family>
+    </accept>
+  </alias>
+
+  <!-- Generic name assignment -->
+  <alias>
+    <family>Cantarell</family>
+    <default>
+      <family>system-ui</family>
+    </default>
+  </alias>
+
+</fontconfig>
diff --git a/31-cantarell.conf b/31-cantarell.conf
new file mode 100644
index 0000000..bbc8600
--- /dev/null
+++ b/31-cantarell.conf
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<!--
+
+     Define aliasing and other fontconfig settings for Cantarell.
+
+-->
+<fontconfig>
+  <!-- Font substitution -->
+  <alias binding="same">
+    <family>system-ui</family>
+    <accept>
+      <family>Cantarell</family>
+    </accept>
+  </alias>
+
+  <!-- Generic name assignment -->
+  <alias>
+    <family>Cantarell</family>
+    <default>
+      <family>system-ui</family>
+    </default>
+  </alias>
+
+</fontconfig>
diff --git a/cantarell-fontconfig.conf b/cantarell-fontconfig.conf
deleted file mode 100644
index db6ad8b..0000000
--- a/cantarell-fontconfig.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!--
-
-     Define aliasing and other fontconfig settings for Cantarell.
-
--->
-<fontconfig>
-  <!-- Font substitution -->
-  <alias binding="same">
-    <family>system-ui</family>
-    <accept>
-      <family>Cantarell</family>
-    </accept>
-  </alias>
-
-  <!-- Generic name assignment -->
-  <alias>
-    <family>Cantarell</family>
-    <default>
-      <family>system-ui</family>
-    </default>
-  </alias>
-
-</fontconfig>