From 4cbe84d3bf9ec4eea6cd73de5f8de0b64f2759c6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 17 Aug 2020 16:42:05 +0200 Subject: [PATCH] Use desktop-file-validate instead of desktop-file-install We haven't been doing vendor prefixing for a while now, which makes it pointless to call out to desktop-file-install. --- inkscape.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/inkscape.spec b/inkscape.spec index e865e39..02db61c 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -153,11 +153,6 @@ cmake \ %make_install find $RPM_BUILD_ROOT -type f -name 'lib*.a' | xargs rm -f -desktop-file-install --vendor="%{?desktop_vendor}" --delete-original --remove-key=TargetEnvironment \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inkscape.desktop - - # No skencil anymore rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions/sk2svg.sh @@ -174,6 +169,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/doc/inkscape/copyright # Validate appdata file appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appdata.xml +# Validate desktop file +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.inkscape.Inkscape.desktop + %files -f %{name}.lang %{!?_licensedir:%global license %%doc} @@ -226,6 +224,7 @@ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appd * Mon Aug 17 2020 Kalev Lember - 1.0-7 - Drop two unneeded dependencies - Validate appdata file in check rather than install section +- Use desktop-file-validate instead of desktop-file-install * Tue Jul 28 2020 Fedora Release Engineering - 1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild