rpms/evince
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Use desktop-file-validate instead of desktop-file-install

Browse Source
This commit is contained in:
Kalev Lember 2015-09-16 14:32:02 +02:00
parent 164a2c4ee5
commit 72323d390c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
evince.spec
View File

@ -26,11 +26,11 @@ BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(poppler-glib) >= %{poppler_version} BuildRequires: pkgconfig(poppler-glib) >= %{poppler_version}
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: gettext BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: libtool BuildRequires: libtool
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: yelp-tools BuildRequires: yelp-tools
BuildRequires: intltool BuildRequires: intltool
BuildRequires: /usr/bin/desktop-file-validate
# For autoconf.sh # For autoconf.sh
BuildRequires: gnome-common >= 2.26 BuildRequires: gnome-common >= 2.26
BuildRequires: libappstream-glib 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 \ 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 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 %find_lang evince --with-gnome
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications 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}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
%check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/evince.desktop
%post %post
update-desktop-database &> /dev/null ||: update-desktop-database &> /dev/null ||:
@ -270,6 +268,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null ||:
%changelog %changelog
* Wed Sep 16 2015 Kalev Lember <klember@redhat.com> - 3.17.92-1 * Wed Sep 16 2015 Kalev Lember <klember@redhat.com> - 3.17.92-1
- Update to 3.17.92 - Update to 3.17.92
- Use desktop-file-validate instead of desktop-file-install
* Wed Sep 02 2015 Michael Catanzaro <mcatanzaro@gnome.org> - 3.17.4-3 * Wed Sep 02 2015 Michael Catanzaro <mcatanzaro@gnome.org> - 3.17.4-3
- Don't recommend nautilus subpackage; it depends on nautilus. - Don't recommend nautilus subpackage; it depends on nautilus.