From 913da6f0db22867f86f8eda5b94d6137b2db3af6 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Mar 26 2018 13:43:01 +0000
Subject: Revert back to 0.0.25


As per Workstation WG's decision to revert back to 0.0.25 for F28:

https://pagure.io/fedora-workstation/issue/40

---

diff --git a/.gitignore b/.gitignore
index a6347d9..89692d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,5 +24,3 @@
 /cantarell-fonts-0.0.23.tar.xz
 /cantarell-fonts-0.0.24.tar.xz
 /cantarell-fonts-0.0.25.tar.xz
-/cantarell-fonts-0.100.tar.xz
-/cantarell-fonts-0.101.tar.xz
diff --git a/abattis-cantarell-fonts.spec b/abattis-cantarell-fonts.spec
index b740d3c..ccd7d13 100644
--- a/abattis-cantarell-fonts.spec
+++ b/abattis-cantarell-fonts.spec
@@ -1,71 +1,60 @@
-%global fontname cantarell
-%global fontconf 31-%{fontname}.conf
+%global actualname cantarell
 
-Name: abattis-cantarell-fonts
-Version: 0.101
-Release: 1%{?dist}
-Summary: Humanist sans serif font
+%global fontname abattis-%{actualname}
+%global fontconf 31-cantarell.conf
 
+%global archivename1 Cantarell-Bold
+%global archivename2 Cantarell-Regular
+
+Name: %{fontname}-fonts
+Version: 0.0.25
+Release: 4%{?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.101/cantarell-fonts-%{version}.tar.xz
-Source1: cantarell-fontconfig.conf
+Source0: http://download.gnome.org/sources/%{actualname}-fonts/0.0/%{actualname}-fonts-%{version}.tar.xz
+Source1: %{fontname}.metainfo.xml
 
 BuildArch: noarch
-
 BuildRequires: fontpackages-devel
-BuildRequires: gettext
-BuildRequires: libappstream-glib-devel
-BuildRequires: meson
-
+BuildRequires: fontforge
 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.
+Cantarell is a set of fonts designed by Dave Crossland.
+It is a sans-serif humanist typeface family.
 
 %prep
-%autosetup -n cantarell-fonts-%{version}
+%autosetup -n %{actualname}-fonts-%{version}
+# Force regeneration
+rm otf/*.otf
 
 %build
-%meson
-%meson_build
+%configure --enable-source-rebuild
+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 %{SOURCE1} \
+install -m 0644 -p fontconfig/%{fontconf} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
 ln -s %{_fontconfig_templatedir}/%{fontconf} \
       %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
-%check
-appstream-util validate-relax --nonet \
-        %{buildroot}%{_datadir}/metainfo/org.gnome.cantarell.metainfo.xml
+# Add AppStream metadata
+install -Dm 0644 -p %{SOURCE1} \
+       %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
 
 %_font_pkg -f %{fontconf} *.otf
 %license COPYING
-%doc NEWS README.md
-%{_datadir}/metainfo/org.gnome.cantarell.metainfo.xml
+%doc NEWS README
+%{_datadir}/appdata/%{fontname}.metainfo.xml
 
 %changelog
-* 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
-- Update to 0.100
-- Switch to the meson build system
-- Use upstream appdata
-- 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
 
diff --git a/abattis-cantarell.metainfo.xml b/abattis-cantarell.metainfo.xml
new file mode 100644
index 0000000..69ddcdd
--- /dev/null
+++ b/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>
diff --git a/cantarell-fontconfig.conf b/cantarell-fontconfig.conf
deleted file mode 100644
index 2b3ab09..0000000
--- a/cantarell-fontconfig.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
-<!--
-
-     Define aliasing and other fontconfig settings for Cantarell.
-
--->
-<fontconfig>
-  <!-- Generic name assignment -->
-  <match target="pattern">
-    <test qual="any" name="family">
-      <string>Cantarell</string>
-    </test>
-    <edit name="family" mode="assign" binding="weak">
-      <string>Cantarell</string>
-    </edit>
-  </match>
-</fontconfig>
diff --git a/sources b/sources
index e98f73d..9ebbb75 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cantarell-fonts-0.101.tar.xz) = 52dbd8358de7e20146e627ab0b1298efb97ee335e45d8e63bab7c3a7d05314d0bb94ac448e34af4c6f7212623185a9e03a30eb24acee4915142e40af0086bbfb
+8fa68460bb292b9c9441af10f99d99d7  cantarell-fonts-0.0.25.tar.xz