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

Many thanks to Parag Nemade <pnemade@fedoraproject.org> for the help
with updating the package!

.gitignore

@@ -24,3 +24,4 @@
 /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

abattis-cantarell-fonts.spec

@@ -1,25 +1,23 @@
-%global actualname cantarell
+%global fontname cantarell
+%global fontconf 31-%{fontname}.conf
 
-%global fontname abattis-%{actualname}
+Name: abattis-cantarell-fonts
-%global fontconf 31-cantarell.conf
+Version: 0.100
-
+Release: 1%{?dist}
-%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/%{actualname}-fonts/0.0/%{actualname}-fonts-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/cantarell-fonts/0.100/cantarell-fonts-%{version}.tar.xz
-Source1: %{fontname}.metainfo.xml
+Source1: cantarell-fontconfig.conf
 
 BuildArch: noarch
+
 BuildRequires: fontpackages-devel
-BuildRequires: fontforge
+BuildRequires: gettext
+BuildRequires: libappstream-glib-devel
+BuildRequires: meson
+
 Requires: fontpackages-filesystem
 
 %description
@@ -27,34 +25,42 @@ Cantarell is a set of fonts designed by Dave Crossland.
 It is a sans-serif humanist typeface family.
 
 %prep
-%autosetup -n %{actualname}-fonts-%{version}
+%autosetup -n cantarell-fonts-%{version}
-# Force regeneration
-rm otf/*.otf
 
 %build
-%configure --enable-source-rebuild
+%meson
-make %{?_smp_mflags}
+%meson_build
 
 %install
-install -m 0755 -d %{buildroot}%{_fontdir}
+%meson_install
-install -m 0644 -p otf/*.otf %{buildroot}%{_fontdir}
+
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
                    %{buildroot}%{_fontconfig_confdir}
-install -m 0644 -p fontconfig/%{fontconf} \
+
+install -m 0644 -p %{SOURCE1} \
         %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
 ln -s %{_fontconfig_templatedir}/%{fontconf} \
       %{buildroot}%{_fontconfig_confdir}/%{fontconf}
 
-# Add AppStream metadata
+%check
-install -Dm 0644 -p %{SOURCE1} \
+appstream-util validate-relax --nonet \
-       %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
+        %{buildroot}%{_datadir}/appdata/org.gnome.cantarell.metainfo.xml
 
 %_font_pkg -f %{fontconf} *.otf
 %license COPYING
-%doc NEWS README
+%doc NEWS README.md
-%{_datadir}/appdata/%{fontname}.metainfo.xml
+%{_datadir}/appdata/org.gnome.cantarell.metainfo.xml
 
 %changelog
+* 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
+- 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
 

abattis-cantarell.metainfo.xml

@@ -1,15 +0,0 @@
-<?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>

cantarell-fontconfig.conf

@@ -0,0 +1,18 @@
+<?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>

sources

@@ -1 +1 @@
-8fa68460bb292b9c9441af10f99d99d7  cantarell-fonts-0.0.25.tar.xz
+SHA512 (cantarell-fonts-0.100.tar.xz) = 1cb4c3ca13e1bf2952ab2e19085f7c3fb655728ecefd18836c2aa4f1234572572f2aca2470eb1c7568d840ff0b59bb097216baea37c59af50bf48b395c74bcc3