diff --git a/60-adf-accanthis-2-fonts.xml b/60-adf-accanthis-2-fonts.xml
new file mode 100644
index 0000000..da51c50
--- /dev/null
+++ b/60-adf-accanthis-2-fonts.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ Accanthis ADF Std No2
+
+ Accanthis ADF Pro No2
+ Accanthis ADF No2
+ Accanthis ADF Std No3
+ Accanthis ADF Pro No3
+ Accanthis ADF No3
+ Horley old style
+ Accanthis ADF Std
+ Accanthis ADF Pro
+ Accanthis ADF
+ serif
+
+
+
+
diff --git a/60-adf-accanthis-3-fonts.xml b/60-adf-accanthis-3-fonts.xml
new file mode 100644
index 0000000..60cc63f
--- /dev/null
+++ b/60-adf-accanthis-3-fonts.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+ Accanthis ADF Std No3
+
+ Accanthis ADF Pro No3
+ Accanthis ADF No3
+ Accanthis ADF Std No2
+ Accanthis ADF Pro No2
+ Accanthis ADF No2
+ Horley old style
+ Accanthis ADF Std
+ Accanthis ADF Pro
+ Accanthis ADF
+ serif
+
+
+
+
diff --git a/60-adf-accanthis-fonts.xml b/60-adf-accanthis-fonts.xml
new file mode 100644
index 0000000..31d5e58
--- /dev/null
+++ b/60-adf-accanthis-fonts.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+ Accanthis ADF Std
+
+ Accanthis ADF Pro
+ Accanthis ADF
+ Galliard
+ ITC Galliard
+ Accanthis ADF Std No2
+ Accanthis ADF Pro No2
+ Accanthis ADF No2
+ Accanthis ADF Std No3
+ Accanthis ADF Pro No3
+ Accanthis ADF No3
+ serif
+
+
+
+
diff --git a/adf-accanthis-2.metainfo.xml b/adf-accanthis-2.metainfo.xml
deleted file mode 100644
index a9cdfbe..0000000
--- a/adf-accanthis-2.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- adf-accanthis-2
- CC0-1.0
- adf-accanthis
-
diff --git a/adf-accanthis-3.metainfo.xml b/adf-accanthis-3.metainfo.xml
deleted file mode 100644
index e9188cf..0000000
--- a/adf-accanthis-3.metainfo.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- adf-accanthis-3
- CC0-1.0
- adf-accanthis
-
diff --git a/adf-accanthis-fonts-fontconfig-2.conf b/adf-accanthis-fonts-fontconfig-2.conf
deleted file mode 100644
index 7665f99..0000000
--- a/adf-accanthis-fonts-fontconfig-2.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- serif
-
- Accanthis ADF Std No2
-
-
-
- Accanthis ADF Std No2
-
- serif
-
-
-
- Accanthis ADF Std
-
- Accanthis ADF Std No2
-
-
-
- Accanthis ADF Std No3
-
- Accanthis ADF Std No2
-
-
-
diff --git a/adf-accanthis-fonts-fontconfig-3.conf b/adf-accanthis-fonts-fontconfig-3.conf
deleted file mode 100644
index c5431d8..0000000
--- a/adf-accanthis-fonts-fontconfig-3.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- serif
-
- Accanthis ADF Std No3
-
-
-
- Accanthis ADF Std No3
-
- serif
-
-
-
- Accanthis ADF Std
-
- Accanthis ADF Std No3
-
-
-
- Accanthis ADF Std No2
-
- Accanthis ADF Std No3
-
-
-
diff --git a/adf-accanthis-fonts-fontconfig.conf b/adf-accanthis-fonts-fontconfig.conf
deleted file mode 100644
index b4f90ae..0000000
--- a/adf-accanthis-fonts-fontconfig.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- serif
-
- Accanthis ADF Std
-
-
-
- Accanthis ADF Std
-
- serif
-
-
-
- Accanthis ADF Std No2
-
- Accanthis ADF Std
-
-
-
- Accanthis ADF Std No3
-
- Accanthis ADF Std
-
-
-
diff --git a/adf-accanthis-fonts.spec b/adf-accanthis-fonts.spec
index a2a2045..c44aa75 100644
--- a/adf-accanthis-fonts.spec
+++ b/adf-accanthis-fonts.spec
@@ -1,207 +1,97 @@
-%global fontname adf-accanthis
-%global fontconf 60-%{fontname}
+# SPDX-License-Identifier: MIT
+Version: 1.8
+Release: 16%{?dist}
+URL: http://arkandis.tuxfamily.org/adffonts.html
+
+%global foundry ADF
+%global fontlicense GPLv2+ with exceptions
+%global fontlicenses OTF/COPYING
+%global fontdocs NOTICE.txt
+
+%global common_description %{expand:
+A Latin font family published by Hirwen Harendal’s Arkandis Digital Foundry,
+Accanthis was inspired from the “Cloister Oldstyle” font family found in the
+“American Specimen Book of Typefaces Suplement”. Its medium contrast is
+sufficient to be reader-friendly and deliver an elegant and refined experience.
+
+Accanthis is a “modernized” garaldic font family according to its creator, and
+is well suited to book typesetting and refined presentations.}
+
+%global fontfamily0 Accanthis
+%global fontsummary0 ADF Accanthis, a “modernized” garaldic serif font family, “Galliard” alternative
+%global fontpkgheader0 %{expand:
+Obsoletes: adf-accanthis-fonts-common < %{version}-%{release}
+}
+%global fonts0 OTF/AccanthisADFStd-*.otf
+%global fontconfngs0 %{SOURCE10}
+%global fontdescription0 %{expand:
+%{common_description}
+
+This variant is intended to serve as alternative to the “Galliard” font family.}
+
+%global fontfamily2 Accanthis-2
+%global fontsummary2 ADF Accanthis Nᵒ2, a “modernized” garaldic serif, “Horley old style” alternative
+%global fonts2 OTF/AccanthisADFStdNo2-*.otf
+%global fontconfngs2 %{SOURCE12}
+%global fontdescription2 %{expand:
+%{common_description}
+
+This variant is closer to the “Horley old style” font family than the original
+version.}
+
+%global fontfamily3 Accanthis-3
+%global fontsummary3 ADF Accanthis Nᵒ3, a “modernized” garaldic serif font family
+%global fonts3 OTF/AccanthisADFStdNo3-*.otf
+%global fontconfngs3 %{SOURCE13}
+%global fontdescription3 %{expand:
+%{common_description}
+
+This variant remixes a slightly modified Accanthis №2 with elements from the
+original Italic and changes to k, p, z and numbers.}
%global archivename Accanthis-Std-20101124
-%global common_desc \
-A Latin typeface published by Hirwen Harendal's Arkandis Digital Foundry, \
-Accanthis was inspired from the “Cloister Oldstyle” typeface found in the \
-“American Specimen Book of Typefaces Suplement”. Its medium contrast is \
-sufficient to be reader-friendly and deliver an elegant and refined experience.\
-\
-Its creator considers it as a “modernized” garaldic typeface. \
-\
-Accanthis is well suited to book typesetting and refined presentations.
-
-
-Name: %{fontname}-fonts
-# Use the main PS version (as documented in NOTICE)
-Version: 1.8
-Release: 15%{?dist}
-Summary: A “modernized” garaldic serif typeface, “Galliard” alternative
-
-License: GPLv2+ with exceptions
-URL: http://arkandis.tuxfamily.org/adffonts.html
Source0: http://arkandis.tuxfamily.org/fonts/%{archivename}.zip
Source1: http://arkandis.tuxfamily.org/docs/Accanthis-Cat.pdf
-Source11: %{name}-fontconfig.conf
-Source12: %{name}-fontconfig-2.conf
-Source13: %{name}-fontconfig-3.conf
-Source14: %{fontname}.metainfo.xml
-Source15: %{fontname}-2.metainfo.xml
-Source16: %{fontname}-3.metainfo.xml
+Source10: 60-%{fontpkgname}.xml
+Source12: 60-%{fontpkgname2}.xml
+Source13: 60-%{fontpkgname3}.xml
+%fontpkg -a
-BuildArch: noarch
-BuildRequires: fontpackages-devel
-
-%description
-%common_desc
-
-It is intended to serve as alternative to the “Galliard” typeface.
-
-%_font_pkg -f %{fontconf}.conf AccanthisADFStd-*.otf
-%{_datadir}/appdata/%{fontname}.metainfo.xml
-
-
-%package common
-Summary: Common files of %{name}
-Requires: fontpackages-filesystem
-
-%description common
-%common_desc
-
-This package consists of files used by other %{name} packages.
-
-
-%package -n adf-accanthis-2-fonts
-Summary: A “modernized” garaldic serif, “Horley old style” alternative
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n adf-accanthis-2-fonts
-%common_desc
-
-This variant is closer to the “Horley old style” typeface than the original
-version.
-
-%_font_pkg -n 2 -f %{fontconf}-2.conf AccanthisADFStdNo2-*.otf
-%{_datadir}/appdata/%{fontname}-2.metainfo.xml
-
-
-%package -n adf-accanthis-3-fonts
-Summary: A “modernized” garaldic serif typeface
-Requires: %{name}-common = %{version}-%{release}
-
-%description -n adf-accanthis-3-fonts
-%common_desc
-
-This variant remixes a slightly modified Accanthis nº2 with elements from the
-original Italic and changes to k, p, z and numbers.
-
-
-%_font_pkg -n 3 -f %{fontconf}-3.conf AccanthisADFStdNo3-*.otf
-%{_datadir}/appdata/%{fontname}-3.metainfo.xml
+%fontmetapkg
+%package doc
+Summary: %{name} optional documentation files
+BuildArch: noarch
+%description doc
+This package provides optional documentation files shipped with %{name}.
%prep
%setup -q -n %{archivename}
install -m 0644 -p %{SOURCE1} .
-for txt in NOTICE.txt OTF/COPYING ; do
- fold -s $txt > $txt.new
- sed -i 's/\r//' $txt.new
- touch -r $txt $txt.new
- mv $txt.new $txt
-done
-
+%linuxtext NOTICE.txt OTF/COPYING
%build
-
+%fontbuild -a
%install
-rm -fr %{buildroot}
-
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p OTF/*.otf %{buildroot}%{_fontdir}
-
-install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
- %{buildroot}%{_fontconfig_confdir}
-
-install -m 0644 -p %{SOURCE11} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
-install -m 0644 -p %{SOURCE12} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-2.conf
-install -m 0644 -p %{SOURCE13} \
- %{buildroot}%{_fontconfig_templatedir}/%{fontconf}-3.conf
-
-# Add AppStream metadata
-install -Dm 0644 -p %{SOURCE14} \
- %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
-install -Dm 0644 -p %{SOURCE15} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-2.metainfo.xml
-install -Dm 0644 -p %{SOURCE16} \
- %{buildroot}%{_datadir}/appdata/%{fontname}-3.metainfo.xml
+%fontinstall -a
-for fconf in %{fontconf}.conf \
- %{fontconf}-2.conf \
- %{fontconf}-3.conf ; do
- ln -s %{_fontconfig_templatedir}/$fconf \
- %{buildroot}%{_fontconfig_confdir}/$fconf
-done
+%check
+%fontcheck -a
+%fontfiles -a
-
-%files common
-%doc NOTICE.txt OTF/COPYING *.pdf
-
+%files doc
+%license OTF/COPYING
+%doc *.pdf
%changelog
-* Tue Jan 28 2020 Fedora Release Engineering - 1.8-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jul 24 2019 Fedora Release Engineering - 1.8-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering - 1.8-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering - 1.8-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering - 1.8-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering - 1.8-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering - 1.8-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering - 1.8-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jun 16 2015 Fedora Release Engineering - 1.8-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Oct 15 2014 Richard Hughes - 1.8-6
-- Add a MetaInfo file for the software center; this is a font we want to show.
-
-* Sat Jun 07 2014 Fedora Release Engineering - 1.8-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering - 1.8-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Feb 13 2013 Fedora Release Engineering - 1.8-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Jul 25 2012 Paul Flo Williams - 1.8-2
-- Correct some spellings
-
-* Wed Jul 25 2012 Paul Flo Williams - 1.8-1
-- New upstream release
-
-* Wed Jul 18 2012 Fedora Release Engineering - 1.6-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Jan 12 2012 Fedora Release Engineering - 1.6-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Feb 09 2011 Fedora Release Engineering - 1.6-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sun Sep 06 2009
-- 1.6-4
-— Stealth upstream update
-
-
-* Fri Jul 24 2009 Fedora Release Engineering
-— 1.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jul 13 2009
-- 1.6-2
-— Use a macro construct friendlier to pre-F12 releases
+* Sat Feb 15 2020 Nicolas Mailhot
+- 1.8-16
+✅ Convert to fonts-rpm-macros use
-* Sun Jul 12 2009
+* Sun Jul 12 2009 Nicolas Mailhot
- 1.6-1
-– Initial packaging
+✅ Initial packaging
diff --git a/adf-accanthis.metainfo.xml b/adf-accanthis.metainfo.xml
deleted file mode 100644
index dff0c97..0000000
--- a/adf-accanthis.metainfo.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- adf-accanthis
- CC0-1.0
- Accanthis
- A “modernized” garaldic serif font
-
diff --git a/sources b/sources
index 69209a9..720d0bb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-616027f748d7bb3ac017fb210990aacc Accanthis-Std-20101124.zip
-452d9cdbd15e342ead73464173bb22bb Accanthis-Cat.pdf
+SHA512 (Accanthis-Cat.pdf) = 4e0fc89dce6ac695f8e4e25d22d4d059072b0abd50b99942ed45c95858d580f61c351482dc5d56d498b3e99cf7500e64ba962d54a437d3bb7e19a676a3b32c02
+SHA512 (Accanthis-Std-20101124.zip) = a5b8a0bda281f04f252ed8d2478a773e3a5ec5c056c0004b20201a13ea736cc354c066e8a0fa9045922d5de1df781bc96c310be41c9f4b2719588a37912d0a7c