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

  Resolves: rhbz#2045012
Convert the spec file to the latest font packaging guidelines.
---
 ...ll-fontconfig.conf => 31-cantarell-vf.conf |  2 +-
 31-cantarell.conf                             | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)
 rename cantarell-fontconfig.conf => 31-cantarell-vf.conf (88%)
 create mode 100644 31-cantarell.conf

diff --git a/cantarell-fontconfig.conf b/31-cantarell-vf.conf
similarity index 88%
rename from cantarell-fontconfig.conf
rename to 31-cantarell-vf.conf
index db6ad8b..bbc8600 100644
--- a/cantarell-fontconfig.conf
+++ b/31-cantarell-vf.conf
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
 <!--
 
      Define aliasing and other fontconfig settings for Cantarell.
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>