diff --git a/31-cantarell-vf.conf b/31-cantarell-vf.conf new file mode 100644 index 0000000..bbc8600 --- /dev/null +++ b/31-cantarell-vf.conf @@ -0,0 +1,25 @@ + + + + + + + system-ui + + Cantarell + + + + + + Cantarell + + system-ui + + + + diff --git a/31-cantarell.conf b/31-cantarell.conf new file mode 100644 index 0000000..bbc8600 --- /dev/null +++ b/31-cantarell.conf @@ -0,0 +1,25 @@ + + + + + + + system-ui + + Cantarell + + + + + + Cantarell + + system-ui + + + + diff --git a/abattis-cantarell-fonts.spec b/abattis-cantarell-fonts.spec index 560999b..0478704 100644 --- a/abattis-cantarell-fonts.spec +++ b/abattis-cantarell-fonts.spec @@ -1,19 +1,22 @@ %global fontname cantarell %global fontconf 31-%{fontname}.conf +%global fontconfvf 31-%{fontname}-vf.conf Name: abattis-cantarell-fonts -Version: 0.301 -Release: 2 +Version: 0.303.1 +Release: 1 Summary: Humanist sans serif font License: Apache-2.0 and OFL-1.1 URL: https://git.gnome.org/browse/cantarell-fonts/ -Source0: https://download.gnome.org/sources/cantarell-fonts/%{version}/cantarell-fonts-%{version}.tar.xz -Source1: cantarell-fontconfig.conf +Source0: https://download.gnome.org/sources/cantarell-fonts/0.303/cantarell-fonts-%{version}.tar.xz +Source1: 31-cantarell.conf +Source2: 31-cantarell-vf.conf BuildArch: noarch BuildRequires: fontpackages-devel gettext libappstream-glib-devel meson +BuildRequires: fontconfig pkgconfig xz pkgconfig(appstream-glib) Requires: fontpackages-filesystem @@ -27,29 +30,41 @@ The font was originally created by Dave Crossland in 2009. %autosetup -n cantarell-fonts-%{version} %build -%meson +%meson \ + -Dfontsdir=%{_fontbasedir}/%{name} \ + -Duseprebuilt=true %meson_build %install %meson_install - install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir} -install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf} +install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/ +install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/ ln -s %{_fontconfig_templatedir}/%{fontconf} %{buildroot}%{_fontconfig_confdir}/%{fontconf} +ln -s %{_fontconfig_templatedir}/%{fontconfvf} %{buildroot}%{_fontconfig_confdir}/%{fontconfvf} %check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.cantarell.metainfo.xml -%_font_pkg -f %{fontconf} *.otf + +%files %license COPYING +%{_fontbasedir}/%{name}/*.otf +%{_fontconfig_confdir}/%{fontconf} +%{_fontconfig_confdir}/%{fontconfvf} +%{_fontconfig_templatedir}/%{fontconf} +%{_fontconfig_templatedir}/%{fontconfvf} %files help %doc NEWS README.md %{_datadir}/metainfo/org.gnome.cantarell.metainfo.xml %changelog +* Sat Oct 22 2022 zhouwenpei - 0.303.1-1 +- update to 0.303.1 + * Wed May 11 2022 liuyumeng - 0.301-2 - fix license error 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 @@ - - - - - - - - Cantarell - - - Cantarell - - - diff --git a/cantarell-fonts-0.301.tar.xz b/cantarell-fonts-0.301.tar.xz deleted file mode 100644 index 6916b44..0000000 Binary files a/cantarell-fonts-0.301.tar.xz and /dev/null differ diff --git a/cantarell-fonts-0.303.1.tar.xz b/cantarell-fonts-0.303.1.tar.xz new file mode 100644 index 0000000..4830bd2 Binary files /dev/null and b/cantarell-fonts-0.303.1.tar.xz differ