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 <pnemade@fedoraproject.org> for the help with updating the package!
This commit is contained in:
Kalev Lember
parent
9fa1c1663e
commit
0c9edd7285
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
||||
@ -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 <klember@redhat.com> - 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 <pnemade@fedoraproject.org> for the help
|
||||
with updating the package!
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.25-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<component type="font">
|
||||
<id>abattis-cantarell</id>
|
||||
<metadata_license>CC-BY-3.0</metadata_license>
|
||||
<name>Cantarell</name>
|
||||
<summary>Cantarell, a Humanist sans-serif font family</summary>
|
||||
<description>
|
||||
<p>
|
||||
Cantarell is a set of fonts designed by Dave Crossland.
|
||||
It is a sans-serif humanist typeface family.
|
||||
</p>
|
||||
</description>
|
||||
<updatecontact>psatpute_at_redhat_dot_com</updatecontact>
|
||||
<url type="homepage">http://abattis.org/cantarell/</url>
|
||||
</component>
|
||||
18
cantarell-fontconfig.conf
Normal file
18
cantarell-fontconfig.conf
Normal 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>
|
||||
Loading…
Reference in New Issue
Block a user