.abattis-cantarell-fonts.metadata

@@ -1 +1 @@
-94c5c6616b41723bc28ca6be90f2975f8fc6a539 SOURCES/cantarell-fonts-0.301.tar.xz
+b893687a68efa3139b8b429560705b48ba118396 SOURCES/cantarell-fonts-0.0.25.tar.xz

.gitignore

@@ -1 +1 @@
-SOURCES/cantarell-fonts-0.301.tar.xz
+SOURCES/cantarell-fonts-0.0.25.tar.xz

SOURCES/abattis-cantarell.metainfo.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="font">
+  <id>abattis-cantarell</id>
+  <metadata_license>CC-BY-3.0</metadata_license>
+  <name>Cantarell</name>
+  <summary>Cantarell, a Humanist sans-serif font family</summary>
+  <description>
+    <p>
+      Cantarell is a set of fonts designed by Dave Crossland.
+      It is a sans-serif humanist typeface family.
+    </p>
+  </description>
+  <updatecontact>psatpute_at_redhat_dot_com</updatecontact>
+  <url type="homepage">http://abattis.org/cantarell/</url>
+</component>

SPECS/abattis-cantarell-fonts.spec

@@ -1,107 +1,68 @@
-%global fontname cantarell
+%global actualname cantarell
-%global fontconf 31-%{fontname}.conf
 
-Name: abattis-cantarell-fonts
+%global fontname abattis-%{actualname}
-Version: 0.301
+%global fontconf 31-cantarell.conf
-Release: 4%{?dist}
-Summary: Humanist sans serif font
 
+%global archivename1 Cantarell-Bold
+%global archivename2 Cantarell-Regular
+
+Name: %{fontname}-fonts
+Version: 0.0.25
+Release: 6%{?dist}
+Summary: Cantarell, a Humanist sans-serif font family
+
+Group: User Interface/X
 License: OFL
 URL: https://git.gnome.org/browse/cantarell-fonts/
-Source0: http://download.gnome.org/sources/cantarell-fonts/0.301/cantarell-fonts-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/%{actualname}-fonts/0.0/%{actualname}-fonts-%{version}.tar.xz
-Source1: cantarell-fontconfig.conf
+Source1: %{fontname}.metainfo.xml
+Source2: cantarell-fontconfig.conf
 
 BuildArch: noarch
-
 BuildRequires: fontpackages-devel
-BuildRequires: gettext
+BuildRequires: fontforge
-BuildRequires: libappstream-glib-devel
-BuildRequires: meson
-
 Requires: fontpackages-filesystem
 
 %description
-The Cantarell font family is a contemporary Humanist sans serif
+Cantarell is a set of fonts designed by Dave Crossland.
-designed for on-screen reading. The fonts were originally designed
+It is a sans-serif humanist typeface family.
-by Dave Crossland.
 
 %prep
-%autosetup -n cantarell-fonts-%{version}
+%autosetup -n %{actualname}-fonts-%{version}
+# Force regeneration
+rm otf/*.otf
 
 %build
-%meson
+%configure --enable-source-rebuild
-%meson_build
+make %{?_smp_mflags}
 
 %install
-%meson_install
+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 %{SOURCE2} \
-install -m 0644 -p %{SOURCE1} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
 ln -s %{_fontconfig_templatedir}/%{fontconf} \
       %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
-%check
+# Add AppStream metadata
-appstream-util validate-relax --nonet \
+install -Dm 0644 -p %{SOURCE1} \
-        %{buildroot}%{_datadir}/metainfo/org.gnome.cantarell.metainfo.xml
+       %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
 
 %_font_pkg -f %{fontconf} *.otf
 %license COPYING
-%doc NEWS README.md
+%doc NEWS README
-%{_datadir}/metainfo/org.gnome.cantarell.metainfo.xml
+%{_datadir}/appdata/%{fontname}.metainfo.xml
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.301-4
+* Tue Jul 25 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 0.0.25-6
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- Rebuilt for MSVSphere 8.8
-  Related: rhbz#1991688
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 0.301-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.301-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan  5 2021 Kalev Lember <klember@redhat.com> - 0.301-1
-- Update to 0.301
-
-* Fri Jul 31 2020 Akira TAGOH <tagoh@redhat.com> - 0.201-4
-- Add the substitution rule for system-ui in fontconfig config.
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.201-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.201-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Jan 14 2020 Kalev Lember <klember@redhat.com> - 0.201-1
-- Update to 0.201
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.111-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.111-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 0.111-1
-- Update to 0.111
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.101-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Mar 15 2018 Kalev Lember <klember@redhat.com> - 0.101-1
-- Update to 0.101
 
-* Wed Mar 14 2018 Kalev Lember <klember@redhat.com> - 0.100-1
+* Wed Dec 23 2020 Akira TAGOH <tagoh@redhat.com> - 0.0.25-6
-- Update to 0.100
+- Backport fontconfig config file from Fedora.
-- Switch to the meson build system
+- Add System UI generic family alias
-- Use upstream appdata
+  Resolves: rhbz#1865788
-- Validate appdata file
-- Include fontconfig file in packaging as it's no longer included upstream
-- Update package summary and description from appdata
-- Many thanks to Parag Nemade <pnemade@fedoraproject.org> for the help
-  with updating the package!
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.25-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild