diff --git a/.gitignore b/.gitignore index 89692d7..2ce491a 100644 --- a/.gitignore +++ b/.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 diff --git a/abattis-cantarell-fonts.spec b/abattis-cantarell-fonts.spec index ccd7d13..47ef942 100644 --- a/abattis-cantarell-fonts.spec +++ b/abattis-cantarell-fonts.spec @@ -1,25 +1,23 @@ -%global actualname cantarell +%global fontname cantarell +%global fontconf 31-%{fontname}.conf -%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} +Name: abattis-cantarell-fonts +Version: 0.100 +Release: 1%{?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 -Source1: %{fontname}.metainfo.xml +Source0: http://download.gnome.org/sources/cantarell-fonts/0.100/cantarell-fonts-%{version}.tar.xz +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} -# Force regeneration -rm otf/*.otf +%autosetup -n cantarell-fonts-%{version} %build -%configure --enable-source-rebuild -make %{?_smp_mflags} +%meson +%meson_build %install -install -m 0755 -d %{buildroot}%{_fontdir} -install -m 0644 -p otf/*.otf %{buildroot}%{_fontdir} +%meson_install + 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 -install -Dm 0644 -p %{SOURCE1} \ - %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml +%check +appstream-util validate-relax --nonet \ + %{buildroot}%{_datadir}/appdata/org.gnome.cantarell.metainfo.xml %_font_pkg -f %{fontconf} *.otf %license COPYING -%doc NEWS README -%{_datadir}/appdata/%{fontname}.metainfo.xml +%doc NEWS README.md +%{_datadir}/appdata/org.gnome.cantarell.metainfo.xml %changelog +* Wed Mar 14 2018 Kalev Lember - 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 for the help + with updating the package! + * Wed Feb 07 2018 Fedora Release Engineering - 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 deleted file mode 100644 index 69ddcdd..0000000 --- a/abattis-cantarell.metainfo.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - abattis-cantarell - CC-BY-3.0 - Cantarell - Cantarell, a Humanist sans-serif font family - -

- Cantarell is a set of fonts designed by Dave Crossland. - It is a sans-serif humanist typeface family. -

-
- psatpute_at_redhat_dot_com - http://abattis.org/cantarell/ -
diff --git a/cantarell-fontconfig.conf b/cantarell-fontconfig.conf new file mode 100644 index 0000000..2b3ab09 --- /dev/null +++ b/cantarell-fontconfig.conf @@ -0,0 +1,18 @@ + + + + + + + + Cantarell + + + Cantarell + + + diff --git a/sources b/sources index 9ebbb75..ffe8e1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8fa68460bb292b9c9441af10f99d99d7 cantarell-fonts-0.0.25.tar.xz +SHA512 (cantarell-fonts-0.100.tar.xz) = 1cb4c3ca13e1bf2952ab2e19085f7c3fb655728ecefd18836c2aa4f1234572572f2aca2470eb1c7568d840ff0b59bb097216baea37c59af50bf48b395c74bcc3