From 8af62eb571b82974e997867886e1fd61f2df1c28 Mon Sep 17 00:00:00 2001
From: Peng Wu <pwu@redhat.com>
Date: Tue, 21 Jun 2022 10:55:03 +0800
Subject: [PATCH] Update the fonts package

---
 ...fontconfig.conf => 66-sil-nuosu-fonts.conf |  2 +-
 sil-nuosu-fonts.spec                          | 67 +++++++++----------
 sil-nuosu.metainfo.xml                        | 17 -----
 3 files changed, 32 insertions(+), 54 deletions(-)
 rename sil-nuosu-fonts-fontconfig.conf => 66-sil-nuosu-fonts.conf (83%)
 delete mode 100644 sil-nuosu.metainfo.xml

diff --git a/sil-nuosu-fonts-fontconfig.conf b/66-sil-nuosu-fonts.conf
similarity index 83%
rename from sil-nuosu-fonts-fontconfig.conf
rename to 66-sil-nuosu-fonts.conf
index e5b247a..5c4ac17 100644
--- a/sil-nuosu-fonts-fontconfig.conf
+++ b/66-sil-nuosu-fonts.conf
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
 <fontconfig>
   <alias>
     <family>sans-serif</family>
diff --git a/sil-nuosu-fonts.spec b/sil-nuosu-fonts.spec
index eb277c5..cd53caa 100644
--- a/sil-nuosu-fonts.spec
+++ b/sil-nuosu-fonts.spec
@@ -1,56 +1,51 @@
-%global fontname sil-nuosu
-%global fontconf 66-%{fontname}.conf
+# Packaging template: basic single-family fonts packaging.
+#
+# SPDX-License-Identifier: MIT
+#
+Version: 2.200
+Release: 5%{?dist}
+URL:     http://scripts.sil.org/SILYi_home
 
-%global archivename NuosuSIL-%{version}.tar.xz
+%global foundry           SIL
+%global fontlicense       OFL
+%global fontlicenses      OFL.txt
+%global fontdocs          README.txt FONTLOG.txt
+%global fontdocsex        %{fontlicenses}
 
-Name:           %{fontname}-fonts
-Version:        2.200
-Release:        4%{?dist}
-Summary:        The Nuosu SIL Font
+%global fontfamily        Nuosu SIL
+%global fontsummary       The Nuosu SIL Font
+%global fonts             NuosuSIL-Regular.ttf
+%global fontconfs         %{SOURCE10}
 
-License:        OFL
-URL:            http://scripts.sil.org/SILYi_home
-Source0:        https://github.com/silnrsi/font-nuosu/releases/download/v%{version}/%{archivename}
-Source1:        %{name}-fontconfig.conf
-Source2:        %{fontname}.metainfo.xml
+%global fontdescription   %{expand:
+The Nuosu SIL Font is a single Unicode font for the standardized Yi scriptused by a large ethnic group in southwestern China.
+}
 
-BuildArch:      noarch
-BuildRequires:  fontpackages-devel
-Requires:       fontpackages-filesystem
+Source0:  https://github.com/silnrsi/font-nuosu/releases/download/v%{version}/NuosuSIL-%{version}.tar.xz
+Source10: 66-sil-nuosu-fonts.conf
 
-%description
-The Nuosu SIL Font is a single Unicode font for the standardized Yi script
-used by a large ethnic group in southwestern China.
-Until this version, the font was called SIL Yi.
+%fontpkg
 
 %prep
 %setup -q -n NuosuSIL-%{version}
 sed -i 's/\r//' OFL.txt FONTLOG.txt
 
 %build
-
+%fontbuild
 
 %install
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.ttf %{buildroot}%{_fontdir}
+%fontinstall
 
-install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
-                   %{buildroot}%{_fontconfig_confdir}
+%check
+%fontcheck
 
-install -m 0644 -p %{SOURCE1} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
-ln -s %{_fontconfig_templatedir}/%{fontconf} \
-      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
-
-# Add AppStream metadata
-install -Dm 0644 -p %{SOURCE2} \
-        %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
-
-%_font_pkg -f %{fontconf} *.ttf
-%doc OFL.txt FONTLOG.txt
-%{_datadir}/appdata/%{fontname}.metainfo.xml
+%fontfiles
 
 %changelog
+* Tue Jun 21 2022 Peng Wu <pwu@redhat.com> - 2.200-5
+- Update the fonts package
+- https://fedoraproject.org/wiki/Changes/New_Fonts_Packaging
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.200-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sil-nuosu.metainfo.xml b/sil-nuosu.metainfo.xml
deleted file mode 100644
index a3ce41a..0000000
--- a/sil-nuosu.metainfo.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
-<component type="font">
-  <id>sil-nuosu</id>
-  <metadata_license>CC-BY-3.0</metadata_license>
-  <name>Nuosu SIL</name>
-  <summary>The Nuosu SIL Font</summary>
-  <description>
-    <p>
-      The Nuosu SIL Font is a single Unicode font for the standardized Yi script
-      used by a large ethnic group in southwestern China.
-      Until this version, the font was called SIL Yi.
-    </p>
-  </description>
-  <updatecontact>pnemade_at_redhat_dot_com</updatecontact>
-  <url type="homepage">http://scripts.sil.org/SILYi_home</url>
-</component>