diff --git a/.gitignore b/.gitignore
index 1f624fa..2f72326 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
GFS_FLEISCHMAN.zip
+/GFS_Fleischman.zip
diff --git a/61-gfs-fleischman-fonts.xml b/61-gfs-fleischman-fonts.xml
new file mode 100644
index 0000000..516a82c
--- /dev/null
+++ b/61-gfs-fleischman-fonts.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+ GFS Fleischman
+
+ fantasy
+
+
+
+
diff --git a/gfs-fleischman-fonts-fontconfig.conf b/gfs-fleischman-fonts-fontconfig.conf
deleted file mode 100644
index eb5301d..0000000
--- a/gfs-fleischman-fonts-fontconfig.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- fantasy
-
- GFS Fleischman
-
-
-
- GFS Fleischman
-
- fantasy
-
-
-
diff --git a/gfs-fleischman-fonts.spec b/gfs-fleischman-fonts.spec
index 4164b71..d3cd3b7 100644
--- a/gfs-fleischman-fonts.spec
+++ b/gfs-fleischman-fonts.spec
@@ -1,24 +1,19 @@
-%global fontname gfs-fleischman
-%global fontconf 61-%{fontname}.conf
-
-%global archivename GFS_FLEISCHMAN
-
-Name: %{fontname}-fonts
+# SPDX-License-Identifier: MIT
Version: 20080303
-Release: 22%{?dist}
-Summary: GFS Fleischman majuscule Greek font
-
-License: OFL
-URL: http://www.greekfontsociety.gr/pages/en_typefaces_majuscules.html
-Source0: http://www.greekfontsociety.gr/%{archivename}.zip
-Source1: %{name}-fontconfig.conf
-Source2: %{fontname}.metainfo.xml
-
-BuildArch: noarch
-BuildRequires: fontpackages-devel
-Requires: fontpackages-filesystem
-
-%description
+Release: 23%{?dist}
+URL: http://www.greekfontsociety-gfs.gr/typefaces/majuscule
+
+%global foundry GFS
+%global fontlicense OFL
+%global fontlicenses OFL.txt
+%global fontdocs *.txt
+%global fontdocsex %{fontlicenses}
+
+%global fontfamily Fleischman
+%global fontsummary GFS Fleischman, a majuscule Greek font family
+%global fonts *.otf
+%global fontconfngs %{SOURCE10}
+%global fontdescription %{expand:
As it is known, the Greek alphabet was used in majuscule form for over a
millennium before the minuscule letters gradually replaced it until they became
the official script in the 9th century A.D. Thereafter, majuscule letters were
@@ -33,115 +28,40 @@ letters modelled on the Roman antiquity, i.e. with thick and thin strokes and
serifs. At the same time the Byzantine majuscule tradition, principally used on
theological editions, remainned alive until the early 19th century.
-GFS Fleischman was cut by Johann Michael Fleishman, typecutter of the Dutch
+GFS Fleischman was cut by Johann Michael Fleischman, typecutter of the Dutch
Enschedé foundry and follows the baroque style of the mid-18th century
æsthetics.
-It has been designed by George D. Matthiopoulos.
+It has been designed by George D. Matthiopoulos.}
+
+%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
%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
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p *.otf %{buildroot}%{_fontdir}
-
-install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
- %{buildroot}%{_fontconfig_confdir}
+%fontinstall
-install -m 0644 -p %{SOURCE1} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
-ln -s %{_fontconfig_templatedir}/%{fontconf} \
- %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+%check
+%fontcheck
-# Add AppStream metadata
-install -Dm 0644 -p %{SOURCE2} \
- %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
-
-%_font_pkg -f %{fontconf} *.otf
-%doc *.txt
-%{_datadir}/appdata/%{fontname}.metainfo.xml
+%fontfiles
%changelog
-* Tue Jan 28 2020 Fedora Release Engineering - 20080303-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering - 20080303-21
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering - 20080303-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering - 20080303-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering - 20080303-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering - 20080303-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering - 20080303-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering - 20080303-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering - 20080303-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Oct 17 2014 Parag Nemade - 20080303-13
-- Add metainfo file to show this font in gnome-software
-
-* Sat Jun 07 2014 Fedora Release Engineering - 20080303-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering - 20080303-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Feb 13 2013 Fedora Release Engineering - 20080303-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering - 20080303-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering - 20080303-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Feb 08 2011 Fedora Release Engineering - 20080303-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Jul 24 2009 Fedora Release Engineering - 20080303-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering - 20080303-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Feb 16 2009 Nicolas Mailhot
-- 20080303-4
-— prepare for F11 mass rebuild, new rpm and new fontpackages
-
-* Sun Nov 23 2008 Nicolas Mailhot
-- 20080303-3
-ᛤ ‘rpm-fonts’ renamed to “fontpackages”
-
-* Fri Nov 14 2008 Nicolas Mailhot
-- 20080303-2
-▤ Rebuild using new « rpm-fonts »
+* Sat Feb 15 2020 Nicolas Mailhot
+- 20080303-23
+✅ Convert to fonts-rpm-macros use
-* Sun Jul 06 2008 Nicolas Mailhot
+* Sun Jul 06 2008 Nicolas Mailhot
- 20080303-1
-Δ initial packaging
+✅ Initial packaging
diff --git a/gfs-fleischman.metainfo.xml b/gfs-fleischman.metainfo.xml
deleted file mode 100644
index 6e4f40e..0000000
--- a/gfs-fleischman.metainfo.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- gfs-fleischman
- CC-BY-3.0
- GFS Fleischman
- GFS Fleischman majuscule Greek font
-
-
- GFS Fleischman was cut by Johann Michael Fleishman, typecutter of the Dutch
- Enschedé foundry and follows the baroque style of the mid-18th century
- æsthetics.
-
- It has been designed by George D. Matthiopoulos.
-