From 9b1b1a94d1cbf390beb7ffe002bf3d6738f77e7e Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@fedoraproject.org>
Date: Fri, 13 Mar 2020 12:53:04 +0530
Subject: [PATCH] Convert to new fonts packaging guidelines and update CI
 script

---
 ...ntconfig.conf => 65-0-jomolhari-fonts.conf |  0
 jomolhari-fonts.spec                          | 71 ++++++++-----------
 jomolhari.metainfo.xml                        | 19 -----
 tests/tests.yml                               |  2 +-
 4 files changed, 30 insertions(+), 62 deletions(-)
 rename jomolhari-fonts-fontconfig.conf => 65-0-jomolhari-fonts.conf (100%)
 delete mode 100644 jomolhari.metainfo.xml

diff --git a/jomolhari-fonts-fontconfig.conf b/65-0-jomolhari-fonts.conf
similarity index 100%
rename from jomolhari-fonts-fontconfig.conf
rename to 65-0-jomolhari-fonts.conf
diff --git a/jomolhari-fonts.spec b/jomolhari-fonts.spec
index 88090c8..a2c8c61 100644
--- a/jomolhari-fonts.spec
+++ b/jomolhari-fonts.spec
@@ -1,63 +1,50 @@
-%global	fontname jomolhari
-%global fontconf 65-0-%{fontname}.conf
-
-Name:		%{fontname}-fonts
-Version:	0.003
-Release:	28%{?dist}
-Summary:	Jomolhari a Bhutanese style font for Tibetan and Dzongkha
-
-License:	OFL
-# Looks like currently following URL is gone now. Maybe temporary issue
-#URL:		http://chris.fynn.googlepages.com/jomolhari
+Version:        0.003
+Release:        29%{?dist}
 # Try following URL for this package
 #URL:           https://sites.google.com/site/chrisfynn2/home/fonts/jomolhari
-Source0:	http://chris.fynn.googlepages.com/jomolhari-alpha003c.zip
-Source1:        %{name}-fontconfig.conf 
-Source2:        %{fontname}.metainfo.xml
+# Looks like currently following URL is gone now. Maybe temporary issue
+#URL:           http://chris.fynn.googlepages.com/jomolhari
 
-BuildArch:	noarch
-BuildRequires:	fontpackages-devel
-Requires:	fontpackages-filesystem
+%global fontlicense       OFL
+%global fontlicenses      OFL.txt
+%global fontdocs          *.txt
+%global fontdocsex        %{fontlicenses}
 
-%description
+%global fontfamily        Jomolhari
+%global fontsummary       Jomolhari a Bhutanese style font for Tibetan and Dzongkha
+%global archivename       jomolhari-alpha003c
+%global fonts             *.ttf
+%global fontconfs         %{SOURCE1}
+%global fontdescription   %{expand:
 Jomolhari is an TrueType OpenType Bhutanese style font for Dzongkha and
 Tibetan text. It is based on Bhutanese manuscript examples, supports the
 Unicode and the Chinese encoding for Tibetan.
-The font supports the standard combinations used in most texts.
+The font supports the standard combinations used in most texts.}
+
+Source0: http://chris.fynn.googlepages.com/%{archivename}.zip
+Source1:        65-0-%{fontpkgname}.conf 
+
+%fontpkg
 
 %prep
 %setup -q -c
+%linuxtext FONTLOG.txt OFL-FAQ.txt OFL.txt
 
 %build
-# Empty build section
+%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}
-
-for i in FONTLOG.txt OFL-FAQ.txt OFL.txt
-do
-	tr -d '\r' < $i > ${i}.tmp
-	mv -f ${i}.tmp $i
-done
-
-# Add AppStream metadata
-install -Dm 0644 -p %{SOURCE2} \
-        %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
-
-%_font_pkg -f 65-0-%{fontname}.conf *.ttf
-%doc FONTLOG.txt OFL-FAQ.txt OFL.txt
-%{_datadir}/appdata/%{fontname}.metainfo.xml
+%fontfiles
 
 %changelog
+* Fri Mar 13 2020 Parag Nemade <pnemade AT redhat DOT com> - 0.003-29
+- Convert to new fonts packaging guidelines
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.003-28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/jomolhari.metainfo.xml b/jomolhari.metainfo.xml
deleted file mode 100644
index 7af8492..0000000
--- a/jomolhari.metainfo.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Parag Nemade <pnemade AT redhat DOT com> -->
-<component type="font">
-  <id>jomolhari</id>
-  <metadata_license>CC-BY-3.0</metadata_license>
-  <name>Jomolhari</name>
-  <summary>Jomolhari a Bhutanese style font for Tibetan and Dzongkha</summary>
-  <description>
-    <p>
-      Jomolhari is an TrueType OpenType Bhutanese style font for Dzongkha and
-      Tibetan text. It is based on Bhutanese manuscript examples, supports the
-      Unicode and the Chinese encoding for Tibetan.
-      The font supports the standard combinations used in most texts.
-    </p>
-  </description>
-  <updatecontact>pnemade_at_redhat_dot_com</updatecontact>
-  <url type="homepage">https://sites.google.com/site/chrisfynn2/home/fonts/jomolhari</url>
-</component>
-
diff --git a/tests/tests.yml b/tests/tests.yml
index dda33ac..eaad7fc 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -5,7 +5,7 @@
   - role: custom-test-fonts
     required_packages:
     - jomolhari-fonts
-    path_prefix: /usr/share/fonts/jomolhari
+    path_prefix: /usr/share/fonts/jomolhari-fonts
     package: jomolhari-fonts
     coverage:
      - bo