From 5e855166c0d73e83d63374e1b6324df3194a4f4f Mon Sep 17 00:00:00 2001
From: Parag Nemade <pnemade@fedoraproject.org>
Date: Mar 18 2020 03:56:21 +0000
Subject: Convert to new fonts packaging guidelines and update CI script


---

diff --git a/66-sil-abyssinica-fonts.conf b/66-sil-abyssinica-fonts.conf
new file mode 100644
index 0000000..4b1f27f
--- /dev/null
+++ b/66-sil-abyssinica-fonts.conf
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+	<!-- Generic names -->
+	<alias>
+		<family>Abyssinica SIL</family>
+		<default>
+			<family>serif</family>
+		</default>
+	</alias>
+	<!-- Simple priority lists -->
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>Abyssinica SIL</family>
+		</prefer>
+	</alias>
+        <match target="font">
+          <test name="family" ignore-blanks="yes">
+             <string>Abyssinica SIL</string>
+          </test>
+          <edit name="autohint" mode="assign">
+             <bool>true</bool>
+          </edit>
+        </match>
+</fontconfig>
+
diff --git a/66-sil-abyssinica.conf b/66-sil-abyssinica.conf
deleted file mode 100644
index 4b1f27f..0000000
--- a/66-sil-abyssinica.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<fontconfig>
-	<!-- Generic names -->
-	<alias>
-		<family>Abyssinica SIL</family>
-		<default>
-			<family>serif</family>
-		</default>
-	</alias>
-	<!-- Simple priority lists -->
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>Abyssinica SIL</family>
-		</prefer>
-	</alias>
-        <match target="font">
-          <test name="family" ignore-blanks="yes">
-             <string>Abyssinica SIL</string>
-          </test>
-          <edit name="autohint" mode="assign">
-             <bool>true</bool>
-          </edit>
-        </match>
-</fontconfig>
-
diff --git a/sil-abyssinica-fonts.spec b/sil-abyssinica-fonts.spec
index 80b97c2..97fb6f3 100644
--- a/sil-abyssinica-fonts.spec
+++ b/sil-abyssinica-fonts.spec
@@ -1,26 +1,20 @@
-%global fontname     sil-abyssinica
-%global archive_name AbyssinicaSIL
-%global fontconf     66-%{fontname}.conf
-
-Name:           %{fontname}-fonts
 Version:        1.200
-Release:        17%{?dist}
-Summary:        SIL Abyssinica fonts
-
-License:        OFL
-URL:            http://scripts.sil.org/AbyssinicaSIL
-# download from http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=AbyssinicaSIL1.200.zip&filename=AbyssinicaSIL1.200.zip
-Source0:        %{archive_name}%{version}.zip
-Source1:        %{fontconf}
-Source2:        %{fontname}.metainfo.xml
-
-BuildArch:      noarch
-Requires:       fontpackages-filesystem
-BuildRequires:  fontpackages-devel
-BuildRequires:  dos2unix
-
-
-%description
+Release:        18%{?dist}
+
+%global foundry           SIL
+%global fontlicense       OFL
+%global fontlicenses      OFL.txt
+%global fontdocs          *.txt documentation/*.txt
+%global fontdocsex        %{fontlicenses}
+
+%global fontfamily        Abyssinica SIL
+%global fontsummary       SIL Abyssinica fonts
+%global projectname       AbyssinicaSIL
+%global archivename       %{lua:t=string.gsub(rpm.expand("%{fontfamily}"), "[%p%s]+", ""); print(t)}%{version}
+URL:                      https://software.sil.org/%{projectname}/
+%global fonts             *.ttf
+%global fontconfs         %{SOURCE1}
+%global fontdescription   %{expand:
 SIL Abyssinica is a Unicode typeface family containing glyphs for the
 Ethiopic script.
 
@@ -32,39 +26,35 @@ non-Unicode characters in the Private Use Area (see Private-use (PUA)
 characters supported by Abyssinica SIL).
 
 Abyssinica SIL is based on Ethiopic calligraphic traditions. This release is
-a regular typeface, with no bold or italic version available or planned.
+a regular typeface, with no bold or italic version available or planned.}
 
 
-%prep
-%setup -q -n %{archive_name}-%{version}
+# download from http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=AbyssinicaSIL1.200.zip&filename=AbyssinicaSIL1.200.zip
+Source0:        %{archivename}.zip
+Source1:        66-%{fontpkgname}.conf
 
+%fontpkg
 
-%build
-dos2unix FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt documentation/DOCUMENTATION.txt
+%prep
+%setup -q -n %{projectname}-%{version}
+%linuxtext FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt documentation/DOCUMENTATION.txt
 
+%build
+%fontbuild
 
 %install
-#fonts
-install -d -m 0755 %{buildroot}%{_fontdir}
-install -m 0644 *.ttf %{buildroot}%{_fontdir}
-
-#fontconfig
-install -d -m 0755 %{buildroot}%{_fontconfig_templatedir} \
-                   %{buildroot}%{_fontconfig_confdir}
-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 FONTLOG.txt OFL.txt OFL-FAQ.txt README.txt
-%doc documentation/*
-%{_datadir}/appdata/%{fontname}.metainfo.xml
+%fontinstall
+
+%check
+%fontcheck
+
+%fontfiles
+
 
 %changelog
+* Thu Mar 12 2020 Parag Nemade <pnemade AT redhat DOT com> - 1.200-18
+- Convert to new fonts packaging guidelines
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.200-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sil-abyssinica.metainfo.xml b/sil-abyssinica.metainfo.xml
deleted file mode 100644
index afb0ea8..0000000
--- a/sil-abyssinica.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-abyssinica</id>
-  <metadata_license>CC-BY-3.0</metadata_license>
-  <name>Abyssinica SIL</name>
-  <summary>SIL Abyssinica fonts</summary>
-  <description>
-    <p>
-      SIL Abyssinica is a Unicode typeface family containing glyphs for the
-      Ethiopic script.
-    </p>
-  </description>
-  <updatecontact>pnemade_at_redhat_dot_com</updatecontact>
-  <url type="homepage">http://scripts.sil.org/AbyssinicaSIL</url>
-</component>
-
diff --git a/tests/tests.yml b/tests/tests.yml
index 6572a95..fcf59b6 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -5,7 +5,7 @@
   - role: custom-test-fonts
     required_packages:
     - sil-abyssinica-fonts
-    path_prefix: /usr/share/fonts/sil-abyssinica
+    path_prefix: /usr/share/fonts/sil-abyssinica-fonts
     package: sil-abyssinica-fonts
     coverage:
      - en