Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
c95c447760
!13 change the font library path to /usr/share/fonts
From: @zhouwenpei 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-07-27 09:13:25 +00:00
zhouwenpei
7364edc452 change the font library path to /usr/share/fonts 2022-07-27 15:47:02 +08:00
openeuler-ci-bot
7d4fb9fffa
!12 【轻量级 PR】:update yaml file
From: @jxy_git 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2022-06-02 08:40:03 +00:00
jiangxinyu
20f9663213
update yaml file 2022-06-02 05:45:34 +00:00
openeuler-ci-bot
bbb9a627ae
!7 fix license error
From: @liuyumeng1 
Reviewed-by: @zzm_567, @t_feng 
Signed-off-by: @t_feng
2022-05-10 01:31:49 +00:00
weiwei_tiantian
8cf1645e0e fix license error 2022-05-07 17:29:23 +08:00
openeuler-ci-bot
5f7678f6b9
!6 update to 0.303.1
From: @zhang__3125 
Reviewed-by: @dwl301 
Signed-off-by: @dwl301
2022-04-13 04:47:52 +00:00
zhang__3125
552b44e2fa update to 0.303.1 2022-04-13 12:14:34 +08:00
openeuler-ci-bot
c85eb7670f !5 Version upgrade to abattis-cantarell-fonts-0.301
From: @yangl777
Reviewed-by: @orange-snn
Signed-off-by: @orange-snn
2021-02-03 11:14:05 +08:00
jinzhimin369
1b0343a4fc update to 0.301 2021-02-01 10:33:43 +08:00
7 changed files with 87 additions and 30 deletions

25
31-cantarell-vf.conf Normal file
View File

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

25
31-cantarell.conf Normal file
View File

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

View File

@ -1,20 +1,21 @@
%global fontname cantarell
%global fontconf 31-%{fontname}.conf
%global fontconfvf 31-%{fontname}-vf.conf
Name: abattis-cantarell-fonts
Version: 0.201
Release: 1
Version: 0.303.1
Release: 3
Summary: Humanist sans serif font
License: OFL
License: Apache-2.0 and OFL-1.1
URL: https://git.gnome.org/browse/cantarell-fonts/
Source0: https://download.gnome.org/sources/cantarell-fonts/0.201/cantarell-fonts-%{version}.tar.xz
Source1: cantarell-fontconfig.conf
Source0: https://download.gnome.org/sources/cantarell-fonts/%{version}/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
%description
@ -27,29 +28,53 @@ 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
* Wed Jul 27 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 0.303.1-3
- change the font library path to /usr/share/fonts
* Sat May 07 2022 liuyumeng <liuyumeng5@h-partners.com> - 0.303.1-2
- fix license error
* 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
- SUG:NA
- DESC:version update
* Mon Jul 20 2020 wangye <wangye70@huawei.com> - 0.201-1
- Type:enhancement
- ID:NA

View File

@ -1,4 +1,4 @@
version_control: gitlab.gnome
src_repo: cantarell-fonts
tag_prefix: "^v"
seperator: "."
separator: "."

View File

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

Binary file not shown.

Binary file not shown.