Compare commits

..

No commits in common. "20156b0ebfc53d17a7cb0dc071bbc3ab41358eb1" and "4e62263f91796f30bdde6f60a0f7db4b8d5799d1" have entirely different histories.

7 changed files with 31 additions and 93 deletions

View File

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

View File

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

View File

@ -1,22 +1,19 @@
%global fontname cantarell
%global fontconf 31-%{fontname}.conf
%global fontconfvf 31-%{fontname}-vf.conf
Name: abattis-cantarell-fonts
Version: 0.303.1
Release: 1
Version: 0.111
Release: 2
Summary: Humanist sans serif font
License: Apache-2.0 and OFL-1.1
License: OFL
URL: https://git.gnome.org/browse/cantarell-fonts/
Source0: https://download.gnome.org/sources/cantarell-fonts/0.303/cantarell-fonts-%{version}.tar.xz
Source1: 31-cantarell.conf
Source2: 31-cantarell-vf.conf
Source0: https://download.gnome.org/sources/cantarell-fonts/0.111/cantarell-fonts-%{version}.tar.xz
Source1: cantarell-fontconfig.conf
BuildArch: noarch
BuildRequires: fontpackages-devel gettext libappstream-glib-devel meson
BuildRequires: fontconfig pkgconfig xz pkgconfig(appstream-glib)
Requires: fontpackages-filesystem
@ -30,56 +27,29 @@ The font was originally created by Dave Crossland in 2009.
%autosetup -n cantarell-fonts-%{version}
%build
%meson \
-Dfontsdir=%{_fontbasedir}/%{name} \
-Duseprebuilt=true
%meson
%meson_build
%install
%meson_install
install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} %{buildroot}%{_fontconfig_confdir}
install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/
install -m 0644 -p %{SOURCE2} %{buildroot}%{_fontconfig_templatedir}/
install -m 0644 -p %{SOURCE1} %{buildroot}%{_fontconfig_templatedir}/%{fontconf}
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
%files
%_font_pkg -f %{fontconf} *.otf
%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 <zhouwenpei1@h-partners.com> - 0.303.1-1
- update to 0.303.1
* Wed May 11 2022 liuyumeng <liuyumeng5@h-partners.com> - 0.301-2
- fix license error
* Wed Jan 27 2021 yanglu <yanglu60@huawei.com> - 0.301-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:version update
* Mon Jul 20 2020 wangye <wangye70@huawei.com> - 0.201-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:version update
* Mon Sep 30 2019 openEuler Buildteam <buildteam@openeuler.org> - 5.4-15
- Type:enhancement
- ID:NA

View File

@ -1,4 +1,4 @@
version_control: gitlab.gnome
src_repo: cantarell-fonts
tag_prefix: "^v"
seperator: "."
version_control: git
src_repo: https://gitlab.gnome.org/GNOME/cantarell-fonts.git
tag_prefix: ^v
seperator: .

18
cantarell-fontconfig.conf Normal file
View File

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

Binary file not shown.

Binary file not shown.