!6 update to 0.303.1

From: @zhang__3125 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301

31-cantarell-vf.conf

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<!--
+
+     Define aliasing and other fontconfig settings for Cantarell.
+
+-->
+<fontconfig>
+  <!-- Font substitution -->
+  <alias binding="same">
+    <family>system-ui</family>
+    <accept>
+      <family>Cantarell</family>
+    </accept>
+  </alias>
+
+  <!-- Generic name assignment -->
+  <alias>
+    <family>Cantarell</family>
+    <default>
+      <family>system-ui</family>
+    </default>
+  </alias>
+
+</fontconfig>

31-cantarell.conf

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<!--
+
+     Define aliasing and other fontconfig settings for Cantarell.
+
+-->
+<fontconfig>
+  <!-- Font substitution -->
+  <alias binding="same">
+    <family>system-ui</family>
+    <accept>
+      <family>Cantarell</family>
+    </accept>
+  </alias>
+
+  <!-- Generic name assignment -->
+  <alias>
+    <family>Cantarell</family>
+    <default>
+      <family>system-ui</family>
+    </default>
+  </alias>
+
+</fontconfig>

abattis-cantarell-fonts.spec

@@ -1,20 +1,21 @@
 %global    fontname    cantarell
 %global    fontconf    31-%{fontname}.conf
+%global    fontconfvf   31-%{fontname}-vf.conf
 
 Name:                  abattis-cantarell-fonts
-Version:               0.301
+Version:               0.303.1
 Release:               1
 Summary:               Humanist sans serif font
-
 License:               OFL
 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
+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
 
 %description
@@ -27,29 +28,41 @@ The font was originally created by Dave Crossland in 2009.
 %autosetup -n cantarell-fonts-%{version}
 
 %build
-%meson
+%meson \
+        -Dfontsdir=%{_fontconfig_confdir}/%{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
+%{_fontconfig_confdir}/%{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
+* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 0.303.1-1
+- update to 0.303.1
+
 * Wed Jan 27 2021 yanglu <yanglu60@huawei.com> - 0.301-1
 - Type:enhancement
 - ID:NA

cantarell-fontconfig.conf

@@ -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>