From dfdf661815cb22a3775c2b673d2782c4cd6dba0f Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Jan 26 2022 07:03:12 +0000
Subject: Add a sub-package for variable font, abattis-cantarell-vf-fonts.


  Resolves: rhbz#2045012
Convert the spec file to the latest font packaging guidelines.

---

diff --git a/abattis-cantarell-fonts.spec b/abattis-cantarell-fonts.spec
index a758be3..a15dd56 100644
--- a/abattis-cantarell-fonts.spec
+++ b/abattis-cantarell-fonts.spec
@@ -1,29 +1,45 @@
-%global fontname cantarell
-%global fontconf 31-%{fontname}.conf
-
-Name: abattis-cantarell-fonts
 Version: 0.301
-Release: 6%{?dist}
-Summary: Humanist sans serif font
-
-License: OFL
+Release: 7%{?dist}
 URL: https://gitlab.gnome.org/GNOME/cantarell-fonts/
-Source0: http://download.gnome.org/sources/cantarell-fonts/0.301/cantarell-fonts-%{version}.tar.xz
-Source1: cantarell-fontconfig.conf
 
-BuildArch: noarch
+%global	common_description	%{expand:
+The Cantarell font family is a contemporary Humanist sans serif
+designed for on-screen reading. The fonts were originally designed
+by Dave Crossland.}
+
+%global	foundry		abattis
+%global	fontlicense	OFL
+%global	fontlicenses	COPYING
+%global	fontdocs	NEWS README.md
+%global	fontdocsex	%{fontlicenses}
+
+%global	fontfamily0	Cantarell
+%global	fontsummary0	Humanist sans serif font
+%global	fonts0		prebuilt/Cantarell-*.otf
+%global	fontsex0	prebuilt/Cantarell-VF.otf
+%global	fontconfs0	%{SOURCE1}
+%global	fontdescription1	%{expand:
+%{common_description}
+
+This package contains the non-variable font version of the Cantarell font.}
+
+%global	fontfamily1	Cantarell-VF
+%global	fontsummary1	Humanist sans serif font (variable)
+%global	fonts1		prebuilt/Cantarell-VF.otf
+%global	fontconfs1	%{SOURCE2}
+%global fontdescription1	%{expand:
+%{common_description}
+
+This package contains the variable font version of the Cantarell font.}
+
+Source0: http://download.gnome.org/sources/cantarell-fonts/0.301/cantarell-fonts-%{version}.tar.xz
+Source1: 31-cantarell.conf
+Source2: 31-cantarell-vf.conf
 
-BuildRequires: fontpackages-devel
 BuildRequires: gettext
-BuildRequires: libappstream-glib-devel
 BuildRequires: meson
 
-Requires: fontpackages-filesystem
-
-%description
-The Cantarell font family is a contemporary Humanist sans serif
-designed for on-screen reading. The fonts were originally designed
-by Dave Crossland.
+%fontpkg -a
 
 %prep
 %autosetup -n cantarell-fonts-%{version}
@@ -31,28 +47,22 @@ by Dave Crossland.
 %build
 %meson
 %meson_build
+%fontbuild -a
 
 %install
-%meson_install
-
-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 -a
 
 %check
-appstream-util validate-relax --nonet \
-        %{buildroot}%{_datadir}/metainfo/org.gnome.cantarell.metainfo.xml
+%fontcheck -a
 
-%_font_pkg -f %{fontconf} *.otf
-%license COPYING
-%doc NEWS README.md
-%{_datadir}/metainfo/org.gnome.cantarell.metainfo.xml
+%fontfiles -a
 
 %changelog
+* Wed Jan 26 2022 Akira TAGOH <tagoh@redhat.com> - 0.301-7
+- Add a sub-package for variable font, abattis-cantarell-vf-fonts.
+  Resolves: rhbz#2045012
+- Convert the spec file to the latest font packaging guidelines.
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.301-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild