From 3f3b417d119f2b10d793748e59b59dc13ffddb98 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Wed, 24 May 2023 11:28:02 +0530 Subject: [PATCH] Convert to new fonts packaging guidelines Migrate to SPDX license expression --- .gitignore | 1 + 65-0-gubbi.conf => 65-0-gubbi-fonts.conf | 2 +- gubbi-fonts.spec | 63 +++++++++++------------- gubbi.metainfo.xml | 14 ------ sources | 2 +- tests/tests.yml | 2 +- 6 files changed, 32 insertions(+), 52 deletions(-) rename 65-0-gubbi.conf => 65-0-gubbi-fonts.conf (87%) delete mode 100644 gubbi.metainfo.xml diff --git a/.gitignore b/.gitignore index 9131f39..1de7fd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /gubbi-1.0.tar.gz /gubbi-1.1.tar.gz /gubbi-1.3.tar.gz +/Gubbi-1.3.tar.gz diff --git a/65-0-gubbi.conf b/65-0-gubbi-fonts.conf similarity index 87% rename from 65-0-gubbi.conf rename to 65-0-gubbi-fonts.conf index d7eb8b5..3794e6c 100644 --- a/65-0-gubbi.conf +++ b/65-0-gubbi-fonts.conf @@ -1,5 +1,5 @@ - + diff --git a/gubbi-fonts.spec b/gubbi-fonts.spec index a88d758..20079d6 100644 --- a/gubbi-fonts.spec +++ b/gubbi-fonts.spec @@ -1,55 +1,48 @@ -%global fontname gubbi -%global fontconf 65-0-%{fontname}.conf +BuildRequires: fontforge +BuildRequires: make -Name: %{fontname}-fonts Version: 1.3 Release: 12%{?dist} -Summary: Free Kannada Opentype serif font - -License: GPLv3+ with exceptions URL: https://github.com/aravindavk/Gubbi -Source0: https://github.com/aravindavk/Gubbi/archive/v%{version}.tar.gz#/%{fontname}-%{version}.tar.gz -BuildArch: noarch -BuildRequires: make -BuildRequires: fontforge -BuildRequires: fontpackages-devel -Requires: fontpackages-filesystem -Source1: 65-0-gubbi.conf -Source2: %{fontname}.metainfo.xml -%description -This package provides a free Kannada opentype serif font. +%global fontlicense GPL-3.0-or-later WITH exceptions +%global fontlicenses COPYING +%global fontdocs ChangeLog README +%global fontdocsex %{fontlicenses} + +%global fontfamily Gubbi +%global fontsummary Free Kannada Opentype serif font +%global fonts *.ttf +%global fontconfs %{SOURCE1} +%global fontdescription %{expand: +This package provides a free Kannada opentype serif font.} + +Source0: https://github.com/aravindavk/Gubbi/archive/v%{version}.tar.gz#/%{fontfamily}-%{version}.tar.gz +Source1: 65-0-%{fontpkgname}.conf + +%fontpkg %prep -%autosetup -n Gubbi-%{version} +%autosetup -n %{fontfamily}-%{version} %build +%fontbuild make %install -install -m 0755 -d %{buildroot}%{_fontdir} -install -m 0644 -p *.ttf %{buildroot}%{_fontdir} +%fontinstall -install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ - %{buildroot}%{_fontconfig_confdir} - -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 %{SOURCE2} \ - %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml - -%_font_pkg -f %{fontconf} *.ttf -%doc ChangeLog README -%license COPYING -%{_datadir}/appdata/%{fontname}.metainfo.xml +%check +%fontcheck +%fontfiles %changelog +* Wed May 24 2023 Parag Nemade - 1.3-13 +- Convert to new fonts packaging guidelines +- Migrate to SPDX license expression + * Thu Jan 19 2023 Fedora Release Engineering - 1.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/gubbi.metainfo.xml b/gubbi.metainfo.xml deleted file mode 100644 index 9d3fa3a..0000000 --- a/gubbi.metainfo.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - gubbi - CC-BY-3.0 - Gubbi - Free Kannada opentype serif font - -

- This package provides a free Kannada serif opentype font. -

-
- psatpute_at_redhat_dot_com - https://github.com/aravindavk/Gubbi -
diff --git a/sources b/sources index f1eab20..26de6ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gubbi-1.3.tar.gz) = d964da421e9132e6ae849f7a838316ea3be1466c7085109fe0b4f8371e7aa945891fbaac2f595af6065259b45a8c331c9a4bef88b3e4e4d2bdcd0701ba1ec175 +SHA512 (Gubbi-1.3.tar.gz) = d964da421e9132e6ae849f7a838316ea3be1466c7085109fe0b4f8371e7aa945891fbaac2f595af6065259b45a8c331c9a4bef88b3e4e4d2bdcd0701ba1ec175 diff --git a/tests/tests.yml b/tests/tests.yml index 5221525..a1e3932 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -5,7 +5,7 @@ - role: custom-test-fonts required_packages: - gubbi-fonts - path_prefix: /usr/share/fonts/gubbi + path_prefix: /usr/share/fonts/gubbi-fonts coverage: - kn families: