From 927f4fcc67649cb4ad7716da9eb60776501b7322 Mon Sep 17 00:00:00 2001
From: Peng Wu <pwu@redhat.com>
Date: Mar 02 2023 07:14:57 +0000
Subject: Update to follow New Fonts Packaging Guidelines


---

diff --git a/25-ttf-arphic-ukai-render.conf b/25-ttf-arphic-ukai-render.conf
deleted file mode 100644
index f48a8b2..0000000
--- a/25-ttf-arphic-ukai-render.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<match target="font">
-	  <test name="family" compare="contains" >
-	  <string>AR PL UKai</string>
-	  </test>
-	  <edit name="globaladvance"><bool>false</bool></edit>
-	  <edit name="spacing"><int>90</int></edit>
-	  <edit name="minspace"><bool>false</bool></edit>
-	</match>
-</fontconfig>
diff --git a/65-cjkuni-ukai-fonts.conf b/65-cjkuni-ukai-fonts.conf
new file mode 100644
index 0000000..895bb9a
--- /dev/null
+++ b/65-cjkuni-ukai-fonts.conf
@@ -0,0 +1,111 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<fontconfig>
+	<match>
+		<test name="lang">
+			<string>zh-hk</string>
+		</test>
+		<test name="family">
+			<string>serif</string>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>AR PL UKai HK</string>
+		</edit>
+	</match>
+	<match>
+		<test name="lang">
+			<string>zh-tw</string>
+		</test>
+		<test name="family">
+			<string>serif</string>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>AR PL UKai TW</string>
+		</edit>
+	</match>
+
+    <alias>
+        <family>AR PL UKai TW</family>
+        <default>
+            <family>serif</family>
+        </default>
+    </alias>
+    <alias>
+        <family>AR PL UKai HK</family>
+        <default>
+            <family>serif</family>
+        </default>
+    </alias>
+
+	<match>
+		<test name="lang">
+			<string>zh-hk</string>
+		</test>
+		<test name="family">
+			<string>sans-serif</string>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>AR PL UKai HK</string>
+		</edit>
+	</match>
+	<match>
+		<test name="lang">
+			<string>zh-tw</string>
+		</test>
+		<test name="family">
+			<string>sans-serif</string>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>AR PL UKai TW</string>
+		</edit>
+	</match>
+
+    <alias>
+        <family>AR PL UKai TW</family>
+        <default>
+            <family>sans-serif</family>
+        </default>
+    </alias>
+    <alias>
+        <family>AR PL UKai HK</family>
+        <default>
+            <family>sans-serif</family>
+        </default>
+    </alias>
+
+	<match>
+		<test name="lang">
+			<string>zh-hk</string>
+		</test>
+		<test name="family">
+			<string>monospace</string>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>AR PL UKai HK</string>
+		</edit>
+	</match>
+	<match>
+		<test name="lang">
+			<string>zh-tw</string>
+		</test>
+		<test name="family">
+			<string>monospace</string>
+		</test>
+		<edit name="family" mode="prepend">
+			<string>AR PL UKai TW</string>
+		</edit>
+	</match>
+
+    <alias>
+        <family>AR PL UKai TW</family>
+        <default>
+            <family>monospace</family>
+        </default>
+    </alias>
+    <alias>
+        <family>AR PL UKai HK</family>
+        <default>
+            <family>monospace</family>
+        </default>
+    </alias>
+</fontconfig>
diff --git a/90-cjkuni-ukai-fonts-embolden.conf b/90-cjkuni-ukai-fonts-embolden.conf
new file mode 100644
index 0000000..f1c0815
--- /dev/null
+++ b/90-cjkuni-ukai-fonts-embolden.conf
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<fontconfig>
+	
+	<match target="font" >
+		<test name="family" compare="contains" >
+			<string>AR PL UKai</string>
+		</test> 
+                <!-- check to see if the font is just regular -->
+                <test name="weight" compare="less_eq">
+                        <int>100</int>
+		</test>
+		<test compare="more_eq" target="pattern" name="weight" >
+			<int>180</int>
+		</test>
+		<edit mode="assign" name="embolden" >
+			<bool>true</bool>
+		</edit>
+	</match>
+
+</fontconfig>
diff --git a/90-ttf-arphic-ukai-embolden.conf b/90-ttf-arphic-ukai-embolden.conf
deleted file mode 100644
index dd042cf..0000000
--- a/90-ttf-arphic-ukai-embolden.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	
-	<match target="font" >
-		<test name="family" compare="contains" >
-			<string>AR PL UKai</string>
-		</test> 
-                <!-- check to see if the font is just regular -->
-                <test name="weight" compare="less_eq">
-                        <int>100</int>
-		</test>
-		<test compare="more_eq" target="pattern" name="weight" >
-			<int>180</int>
-		</test>
-		<edit mode="assign" name="embolden" >
-			<bool>true</bool>
-		</edit>
-	</match>
-
-</fontconfig>
diff --git a/cjkuni-ukai-fonts.spec b/cjkuni-ukai-fonts.spec
index 2844b20..87e7faf 100644
--- a/cjkuni-ukai-fonts.spec
+++ b/cjkuni-ukai-fonts.spec
@@ -1,80 +1,62 @@
-%global fontname cjkuni-ukai
-#%global fontconf2 25-ttf-arphic-ukai-render.conf
-%global fontconf3 90-ttf-arphic-ukai-embolden.conf
+# SPDX-License-Identifier: MIT
 
 %define catalogue        %{_sysconfdir}/X11/fontpath.d
 
-%define common_desc \
-CJK Unifonts are Unicode TrueType fonts derived from original fonts made \
-available by Arphic Technology under "Arphic Public License" and extended by \
-the CJK Unifonts project.
+Version: 0.2.20080216.1
+Release: 68%{?dist}
+URL:     http://www.freedesktop.org/wiki/Software/CJKUnifonts
 
-%define ukaibuilddir %{name}-%{version}
+%global foundry           CJKUni
+%global fontlicense       Arphic-1999
 
-Name:           %{fontname}-fonts
-Version:        0.2.20080216.1
-Release:        67%{?dist}
-Summary:        Chinese Unicode TrueType font in Kai face
+%global fontlicenses      license
+%global fontdocs          CONTRIBUTERS FONTLOG KNOWN_ISSUES NEWS README TODO
 
-License:        Arphic
-URL:            http://www.freedesktop.org/wiki/Software/CJKUnifonts
-Source0:        http://ftp.debian.org/debian/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_%{version}.orig.tar.gz
-#Source2:        %{fontconf2}
-Source3:        %{fontconf3}
+%global fontfamily        UKai
+%global fontsummary       Chinese Unicode TrueType font in Kai face
 
-BuildArch:      noarch
-BuildRequires:  fontpackages-devel
-Requires:       fontpackages-filesystem
-Obsoletes:      cjkuni-fonts-common < 0.2.20080216.1-42
+%global fonts             ukai.ttc
+%global fontconfs         %{SOURCE10} %{SOURCE11}
 
-%description
-%common_desc
+%global fontdescription   %{expand:
+CJK Unifonts are Unicode TrueType fonts derived from original fonts made \
+available by Arphic Technology under "Arphic Public License" and extended by \
+the CJK Unifonts project.
 
-CJK Unifonts in Kai face.
+CJK Unifonts in Kai face.}
 
-%prep
-%setup -q -c -n %{name}-%{version}
+Source0:  http://ftp.debian.org/debian/pool/main/t/ttf-arphic-ukai/ttf-arphic-ukai_%{version}.orig.tar.gz
+Source10: 65-%{fontpkgname}.conf
+Source11: 90-%{fontpkgname}-embolden.conf
 
+%fontpkg
+
+%prep
+%autosetup -c
 
 %build
-%{nil}
+%fontbuild
 
 %install
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.ttc %{buildroot}%{_fontdir}
-
-install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
-                   %{buildroot}%{_fontconfig_confdir}
-
-#install -m 0644 -p %{SOURCE2} \
-#        %{buildroot}%{_fontconfig_templatedir}/%{fontconf2}
-#ln -s %{_fontconfig_templatedir}/%{fontconf2} \
-#      %{buildroot}%{_fontconfig_confdir}/%{fontconf2}
-
-install -m 0644 -p %{SOURCE3} \
-        %{buildroot}%{_fontconfig_templatedir}/%{fontconf3}
-ln -s %{_fontconfig_templatedir}/%{fontconf3} \
-      %{buildroot}%{_fontconfig_confdir}/%{fontconf3}
+%fontinstall
 
 # catalogue
 install -m 0755 -d %{buildroot}%{catalogue}
-ln -s %{_fontdir}/ %{buildroot}%{catalogue}/%{name}
+ln -s %{fontdir}/ %{buildroot}%{catalogue}/%{name}
 
 
-%_font_pkg -f *.conf *.ttc
+%check
+%fontcheck
 
-%defattr(-,root,root,-)
-%doc ../%{ukaibuilddir}/license
-%doc ../%{ukaibuilddir}/CONTRIBUTERS
-%doc ../%{ukaibuilddir}/FONTLOG
-%doc ../%{ukaibuilddir}/KNOWN_ISSUES
-%doc ../%{ukaibuilddir}/NEWS
-%doc ../%{ukaibuilddir}/README
-%doc ../%{ukaibuilddir}/TODO
+%fontfiles
 %{catalogue}/%{name}
 
 
 %changelog
+* Tue Feb 28 2023 Peng Wu <pwu@redhat.com> - 0.2.20080216.1-68
+- Update to follow New Fonts Packaging Guidelines
+- Migrate to SPDX license
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.20080216.1-67
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild