From 72323d390c58228ebb03ec63105a701d27c849b8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 16 Sep 2015 14:32:02 +0200 Subject: [PATCH] Use desktop-file-validate instead of desktop-file-install --- evince.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/evince.spec b/evince.spec index 43dfa6f..fb2e735 100644 --- a/evince.spec +++ b/evince.spec @@ -26,11 +26,11 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(poppler-glib) >= %{poppler_version} BuildRequires: libtiff-devel BuildRequires: gettext -BuildRequires: desktop-file-utils BuildRequires: libtool BuildRequires: gtk-doc BuildRequires: yelp-tools BuildRequires: intltool +BuildRequires: /usr/bin/desktop-file-validate # For autoconf.sh BuildRequires: gnome-common >= 2.26 BuildRequires: libappstream-glib @@ -153,10 +153,6 @@ make install DESTDIR=$RPM_BUILD_ROOT appstream-util replace-screenshots $RPM_BUILD_ROOT%{_datadir}/appdata/evince.appdata.xml \ https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/evince/a.png -desktop-file-install --delete-original \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - $RPM_BUILD_ROOT%{_datadir}/applications/evince.desktop - %find_lang evince --with-gnome mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications @@ -170,6 +166,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/evince/4/backends/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +%check +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/evince.desktop %post update-desktop-database &> /dev/null ||: @@ -270,6 +268,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null ||: %changelog * Wed Sep 16 2015 Kalev Lember - 3.17.92-1 - Update to 3.17.92 +- Use desktop-file-validate instead of desktop-file-install * Wed Sep 02 2015 Michael Catanzaro - 3.17.4-3 - Don't recommend nautilus subpackage; it depends on nautilus.