From e7a46941a8a2d658df13be1636a26a01a9567a49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Mon, 28 Aug 2023 19:27:43 +0200
Subject: [PATCH] Fix fontconfig files and file names

Fix: rhbz#2235254
---
 ...dobe-source-code-pro-fonts-fontconfig.conf | 106 ------------------
 61-adobe-source-code-pro-fonts.conf           |  20 ++++
 ...conf => 61-adobe-source-code-vf-fonts.conf |  14 ---
 adobe-source-code-pro-fonts.spec              |   4 +-
 4 files changed, 22 insertions(+), 122 deletions(-)
 delete mode 100644 61-adobe-source-code-pro-fonts-fontconfig.conf
 create mode 100644 61-adobe-source-code-pro-fonts.conf
 rename 61-adobe-source-code-vf-fonts-fontconfig.conf => 61-adobe-source-code-vf-fonts.conf (59%)

diff --git a/61-adobe-source-code-pro-fonts-fontconfig.conf b/61-adobe-source-code-pro-fonts-fontconfig.conf
deleted file mode 100644
index b8758dc..0000000
--- a/61-adobe-source-code-pro-fonts-fontconfig.conf
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
-<fontconfig>
-
-    <!-- Aliasing monospace to prefer Source Code Pro -->
-    <alias>
-        <family>monospace</family>
-        <prefer>
-            <family>Source Code Pro</family>
-        </prefer>
-    </alias>
-
-    <!-- Defaults if Source Code Pro isn't available -->
-    <alias>
-        <family>Source Code Pro</family>
-        <default>
-            <family>monospace</family>
-        </default>
-    </alias>
-
-    <!-- Specifying each style and weight for Source Code Pro -->
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Regular</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Italic</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Bold</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Bold Italic</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Light</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Light Italic</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Medium</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Medium Italic</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Semibold</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Semibold Italic</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro ExtraLight</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro ExtraLight Italic</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Black</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code Pro</family>
-        <prefer>
-            <family>Source Code Pro Black Italic</family>
-        </prefer>
-    </alias>
-</fontconfig>
diff --git a/61-adobe-source-code-pro-fonts.conf b/61-adobe-source-code-pro-fonts.conf
new file mode 100644
index 0000000..0693b1f
--- /dev/null
+++ b/61-adobe-source-code-pro-fonts.conf
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<fontconfig>
+
+    <!-- Aliasing monospace to prefer Source Code Pro -->
+    <alias>
+        <family>monospace</family>
+        <prefer>
+            <family>Source Code Pro</family>
+        </prefer>
+    </alias>
+
+    <!-- Defaults if Source Code Pro isn't available -->
+    <alias>
+        <family>Source Code Pro</family>
+        <default>
+            <family>monospace</family>
+        </default>
+    </alias>
+</fontconfig>
diff --git a/61-adobe-source-code-vf-fonts-fontconfig.conf b/61-adobe-source-code-vf-fonts.conf
similarity index 59%
rename from 61-adobe-source-code-vf-fonts-fontconfig.conf
rename to 61-adobe-source-code-vf-fonts.conf
index ad7de20..3ef8c78 100644
--- a/61-adobe-source-code-vf-fonts-fontconfig.conf
+++ b/61-adobe-source-code-vf-fonts.conf
@@ -16,18 +16,4 @@
             <family>monospace</family>
         </default>
     </alias>
-
-    <!-- Specifying each style for Source Code VF -->
-    <alias>
-        <family>Source Code VF</family>
-        <prefer>
-            <family>Source Code VF Upright</family>
-        </prefer>
-    </alias>
-    <alias>
-        <family>Source Code VF</family>
-        <prefer>
-            <family>Source Code VF Italic</family>
-        </prefer>
-    </alias>
 </fontconfig>
diff --git a/adobe-source-code-pro-fonts.spec b/adobe-source-code-pro-fonts.spec
index c4ad7b2..ebc43f4 100644
--- a/adobe-source-code-pro-fonts.spec
+++ b/adobe-source-code-pro-fonts.spec
@@ -37,8 +37,8 @@ Release:        %autorelease
 URL:            https://github.com/adobe-fonts/source-code-pro
 
 Source:         https://github.com/adobe-fonts/source-code-pro/archive/%{version_roman}R-u/%{version_italic}R-i/%{version_vf}R-vf.tar.gz#/source-code-pro-%{version_roman}R-u-%{version_italic}R-i-%{version_vf}R-vf.tar.gz
-Source10:       61-%{name}-fontconfig.conf
-Source11:       61-%{fontpkgname2}-fontconfig.conf
+Source10:       61-%{name}.conf
+Source11:       61-%{fontpkgname2}.conf
 
 %fontpkg -a