diff --git a/.gitignore b/.gitignore
index a9dad90..96504a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
GFS_PYRSOS.zip
+/GFS_Pyrsos.zip
diff --git a/61-gfs-pyrsos-fonts.xml b/61-gfs-pyrsos-fonts.xml
new file mode 100644
index 0000000..8798843
--- /dev/null
+++ b/61-gfs-pyrsos-fonts.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+ GFS Pyrsos
+
+ GFS Pyrsos
+ Italic
+
+
+ fantasy
+
+
+
+
diff --git a/gfs-pyrsos-fonts-fontconfig.conf b/gfs-pyrsos-fonts-fontconfig.conf
deleted file mode 100644
index 6634023..0000000
--- a/gfs-pyrsos-fonts-fontconfig.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- serif
-
- GFS Pyrsos
-
-
-
- GFS Pyrsos
-
- serif
-
-
-
diff --git a/gfs-pyrsos-fonts.spec b/gfs-pyrsos-fonts.spec
index 46b166c..41d821e 100644
--- a/gfs-pyrsos-fonts.spec
+++ b/gfs-pyrsos-fonts.spec
@@ -1,124 +1,65 @@
-%global fontname gfs-pyrsos
-%global fontconf 61-%{fontname}.conf
-
-%global archivename GFS_PYRSOS
-
-Name: %{fontname}-fonts
+# SPDX-License-Identifier: MIT
Version: 20090618
-Release: 18%{?dist}
-Summary: A 20th century italic Greek typeface
-
-License: OFL
-URL: http://www.greekfontsociety.gr/pages/en_typefaces20th.html
-Source0: http://www.greekfontsociety.gr/%{archivename}.zip
-Source1: %{name}-fontconfig.conf
-
-
-BuildArch: noarch
-BuildRequires: fontpackages-devel
-Requires: fontpackages-filesystem
-
-%description
+Release: 19%{?dist}
+URL: http://www.greekfontsociety-gfs.gr/typefaces/20th_21st_century
+
+%global foundry GFS
+%global fontlicense OFL
+%global fontlicenses OFL.txt
+%global fontdocs *.txt
+%global fontdocsex %{fontlicenses}
+
+%global fontfamily Pyrsos
+%global fontsummary GFS Pyrsos, a 19th century italic Greek font family
+%global fonts *.otf
+%global fontconfngs %{SOURCE10}
+%global fontdescription %{expand:
This typeface first appeared in the late 20s and was used as an alternative
italic type to the most commonly used Greek italics at the time, coming from
Germany (Leipsig). The name commemorates the edition of the Greek encyclopædia
Pyrsos (1927-1933) from which the types were taken.
-
The font was digitally designed by George D. Matthiopoulos and is freely
-available by GFS.
+available by GFS.}
+
+%global archivename %{lua:t=string.gsub(rpm.expand("%{foundry} %{fontfamily}"), "[%p%s]+", "_");print(t)}
+
+Source0: http://www.greekfontsociety-gfs.gr/_assets/fonts/%{archivename}.zip
+Source10: 61-%{fontpkgname}.xml
+%fontpkg
+
+%package doc
+Summary: %{name} optional documentation files
+BuildArch: noarch
+%description doc
+This package provides optional documentation files shipped with %{name}.
%prep
%setup -q -c -T
-unzip -j -L -q %{SOURCE0}
-chmod 0644 *.txt
-for txt in *.txt ; do
- fold -s $txt > $txt.new
- sed -i 's/\r//' $txt.new
- touch -r $txt $txt.new
- mv $txt.new $txt
-done
-
+unzip -j -q %{SOURCE0}
+%linuxtext *.txt
%build
-
+%fontbuild
%install
-rm -fr %{buildroot}
-
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.otf %{buildroot}%{_fontdir}
-
-install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
- %{buildroot}%{_fontconfig_confdir}
-
-install -m 0644 -p %{SOURCE1} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
-ln -s %{_fontconfig_templatedir}/%{fontconf} \
- %{buildroot}%{_fontconfig_confdir}/%{fontconf}
-
-
+%fontinstall
-%_font_pkg -f %{fontconf} *.otf
+%check
+%fontcheck
-%doc *.txt *.pdf
+%fontfiles
+%files doc
+%license OFL.txt
+%doc *.pdf
%changelog
-* Tue Jan 28 2020 Fedora Release Engineering - 20090618-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering - 20090618-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering - 20090618-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering - 20090618-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering - 20090618-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering - 20090618-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering - 20090618-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering - 20090618-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering - 20090618-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering - 20090618-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering - 20090618-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Feb 13 2013 Fedora Release Engineering - 20090618-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering - 20090618-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering - 20090618-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Feb 08 2011 Fedora Release Engineering - 20090618-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Nov 5 2009 Nicolas Mailhot
-- 20090618-3
-— update to upstream's new archive (with new doc)
-
-* Fri Jul 24 2009 Fedora Release Engineering
-- 20090618-2
-— Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Sat Feb 15 2020 Nicolas Mailhot
+- 20090618-19
+✅ Convert to fonts-rpm-macros use
-* Sat Jun 21 2009 Nicolas Mailhot
+* Sun Jun 21 2009 Nicolas Mailhot
- 20090618-1
-— initial packaging
+✅ Initial packaging
diff --git a/sources b/sources
index 274db8b..f0c40a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ad4bce50a20830c93bc6e4437f674e95 GFS_PYRSOS.zip
+SHA512 (GFS_Pyrsos.zip) = 8d3c886552dad8d3a55c742d422c5d9732b842e660f267cf7e7e60494d4b554c8a7bb6c3a9cdd4c2426a4a20835d298187282f882e228a164726d61d023c5232