[eog] Update desktop file validation checks

David King amigadave at fedoraproject.org
Mon Feb 2 22:12:40 UTC 2015


commit 85ca81fe7154084d19bf38bfbb6140b53628af09
Author: David King <amigadave at amigadave.com>
Date:   Mon Feb 2 21:40:06 2015 +0000

    Update desktop file validation checks
    
    https://fedoraproject.org/wiki/Packaging:Guidelines#desktop-file-install_usage

 eog.spec |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/eog.spec b/eog.spec
index 9f36c69..428b16f 100644
--- a/eog.spec
+++ b/eog.spec
@@ -3,7 +3,6 @@
 %define gtk3_version 3.14.0
 %define glib2_version 2.38.0
 %define gnome_desktop_version 2.91.2
-%define desktop_file_utils_version 0.9
 %define libexif_version 0.6.14
 
 Summary: Eye of GNOME image viewer
@@ -33,7 +32,7 @@ BuildRequires: pkgconfig(libpeas-gtk-1.0) >= 0.7.4
 BuildRequires: pkgconfig(librsvg-2.0)
 BuildRequires: pkgconfig(shared-mime-info)
 BuildRequires: pkgconfig(x11)
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool >= 0.50.1
 BuildRequires: itstool
@@ -41,11 +40,7 @@ BuildRequires: libjpeg-devel
 BuildRequires: zlib-devel
 
 Requires:      gsettings-desktop-schemas
-Requires:      glib2%{?_isa} >= %{glib2_version}
-Requires:      gtk3%{?_isa} >= %{gtk3_version}
 
-Requires(post):   desktop-file-utils >= %{desktop_file_utils_version}
-Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 
 %description
 The Eye of GNOME image viewer (eog) is the official image viewer for the
@@ -89,6 +84,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/eog/plugins/*.la
 
+
+%check
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/eog.desktop
 
 
@@ -134,6 +131,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
 * Mon Feb 02 2015 David King <amigadave at amigadave.com> - 3.15.1-1
 - Update to 3.15.1
 - Use pkgconfig for BuildRequires
+- Update desktop file validation checks
 
 * Thu Nov 20 2014 Kalev Lember <kalevlember at gmail.com> - 3.14.3-1
 - Update to 3.14.3


More information about the scm-commits mailing list