From 2df871d9ce6907c91504b78f7636fb652e21acbd Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Nov 22 2017 04:37:19 +0000 Subject: Update specfile template for adding AppStream metainfo files as per https://fedoraproject.org/wiki/Packaging:AppData --- diff --git a/spec-templates/spectemplate-fonts-multi.spec b/spec-templates/spectemplate-fonts-multi.spec index 2a3b935..57544f6 100644 --- a/spec-templates/spectemplate-fonts-multi.spec +++ b/spec-templates/spectemplate-fonts-multi.spec @@ -15,10 +15,12 @@ Summary: License: URL: Source0: -Source1: %{name}-fontconfig.conf +Source1: %{name}--fontconfig.conf +Source2: %{fontname}-.metainfo.xml BuildArch: noarch BuildRequires: fontpackages-devel +BuildRequires: libappstream-glib %description %common_desc @@ -34,17 +36,17 @@ Requires: fontpackages-filesystem This package consists of files used by other %{name} packages. # Repeat for every font family ➅ -%package -n %{fontname}--fonts +%package -n %{fontname}--fonts Summary: Requires: %{name}-common = %{version}-%{release} -%description -n %{fontname}--fonts +%description -n %{fontname}--fonts %common_desc - - -%_font_pkg -n -f %{fontconf}-.conf *.ttf + +%_font_pkg -n -f %{fontconf}-.conf *.ttf +%{_datadir}/metainfo/%{fontname}-.metainfo.xml %prep %autosetup @@ -71,6 +73,14 @@ for fconf in %{fontconf}-.conf \ %{buildroot}%{_fontconfig_confdir}/$fconf done +# Add AppStream metadata file, Repeat for every font family +install -Dm 0644 -p %{SOURCEX} \ + %{buildroot}%{_datadir}/metainfo/%{fontname}-.metainfo.xml + +%check +# Repeat for every font family +appstream-util validate-relax --nonet \ + %{buildroot}%{_datadir}/metainfo/%{fontname}-.metainfo.xml %files common %license add-license-file-here diff --git a/spec-templates/spectemplate-fonts-partial-multi.spec b/spec-templates/spectemplate-fonts-partial-multi.spec index 1a033b0..a8bf817 100644 --- a/spec-templates/spectemplate-fonts-partial-multi.spec +++ b/spec-templates/spectemplate-fonts-partial-multi.spec @@ -5,10 +5,12 @@ %global common_font_desc \ -Source1: %{name}--fontconfig.conf +Source1: %{name}--fontconfig.conf +Source2: %{fontname}-.metainfo.xml # … BuildRequires: fontpackages-devel +BuildRequires: libappstream-glib %description %common_font_desc @@ -26,20 +28,21 @@ This package consists of files used by other %{name} font packages. # Repeat for every font family ③ -%package -fonts +%package -fonts Summary: BuildArch: noarch Requires: %{name}-fonts-common = %{version}-%{release} -%description -n %{fontname}--fonts +%description -n %{fontname}--fonts %common_font_desc - + -%_font_pkg -n -f %{fontconf}-.conf *.ttf +%_font_pkg -n -f %{fontconf}-.conf *.ttf %doc %license add-license-file-here +%{_datadir}/metainfo/%{fontname}-.metainfo.xml # … @@ -64,6 +67,17 @@ for fconf in %{fontconf}-.conf \ %{buildroot}%{_fontconfig_confdir}/$fconf done +# Add AppStream metadata file, Repeat for every font family +install -Dm 0644 -p %{SOURCEX} \ + %{buildroot}%{_datadir}/metainfo/%{fontname}-.metainfo.xml + +# … + +%check +# Repeat for every font family +appstream-util validate-relax --nonet \ + %{buildroot}%{_datadir}/metainfo/%{fontname}-.metainfo.xml + # … %files common diff --git a/spec-templates/spectemplate-fonts-partial-simple.spec b/spec-templates/spectemplate-fonts-partial-simple.spec index b97f90c..f3ff1d6 100644 --- a/spec-templates/spectemplate-fonts-partial-simple.spec +++ b/spec-templates/spectemplate-fonts-partial-simple.spec @@ -3,9 +3,11 @@ # … Source1: %{name}--fontconfig.conf +Source2: %{fontname}.metainfo.xml # … BuildRequires: fontpackages-devel +BuildRequires: libappstream-glib # … @@ -22,6 +24,7 @@ Requires: fontpackages-filesystem %doc %license add-license-file-here +%{_datadir}/metainfo/%{fontname}.metainfo.xml # … @@ -40,6 +43,14 @@ install -m 0644 -p %{SOURCE1} \ ln -s %{_fontconfig_templatedir}/%{fontconf} \ %{buildroot}%{_fontconfig_confdir}/%{fontconf} +# Add AppStream metadata file +install -Dm 0644 -p %{SOURCE2} \ + %{buildroot}%{_datadir}/metainfo/%{fontname}.metainfo.xml + +%check +appstream-util validate-relax --nonet \ + %{buildroot}%{_datadir}/metainfo/%{fontname}.metainfo.xml + # … diff --git a/spec-templates/spectemplate-fonts-simple.spec b/spec-templates/spectemplate-fonts-simple.spec index 75568ad..2e33029 100644 --- a/spec-templates/spectemplate-fonts-simple.spec +++ b/spec-templates/spectemplate-fonts-simple.spec @@ -12,9 +12,12 @@ License: URL: Source0: Source1: %{name}-fontconfig.conf +Source2: %{fontname}.metainfo.xml BuildArch: noarch BuildRequires: fontpackages-devel +BuildRequires: libappstream-glib + Requires: fontpackages-filesystem %description @@ -39,12 +42,19 @@ install -m 0644 -p %{SOURCE1} \ ln -s %{_fontconfig_templatedir}/%{fontconf} \ %{buildroot}%{_fontconfig_confdir}/%{fontconf} +# Add AppStream metadata file +install -Dm 0644 -p %{SOURCE2} \ + %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml + +%check +appstream-util validate-relax --nonet \ + %{buildroot}%{_datadir}/metainfo/%{fontname}.metainfo.xml %_font_pkg -f %{fontconf} *.ttf %license add-license-file-here %doc add-docs-here - +%{_datadir}/metainfo/%{fontname}.metainfo.xml %changelog