[yelp] Remove the desktop file vendor prefix

Kalev Lember kalev at fedoraproject.org
Fri Feb 22 12:19:36 UTC 2013


commit 8405a327f8c664201db7ac4c00ddd67a848c9b6b
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Feb 22 13:18:59 2013 +0100

    Remove the desktop file vendor prefix

 yelp.spec |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/yelp.spec b/yelp.spec
index 336dabf..e9e2055 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -2,7 +2,7 @@ Summary: Help browser for the GNOME desktop
 Name: yelp
 Epoch: 1
 Version: 3.7.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 #VCS: git:git://git.gnome.org/yelp
 Source: http://download.gnome.org/sources/yelp/3.7/%{name}-%{version}.tar.xz
 
@@ -79,15 +79,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/libyelp.a
 rm $RPM_BUILD_ROOT%{_libdir}/libyelp.la
 
-desktop-file-install --vendor gnome --delete-original	\
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
-	--remove-category Application			\
-	$RPM_BUILD_ROOT%{_datadir}/applications/*
-
 mkdir -p -m 755 $RPM_BUILD_ROOT/%{_datadir}/gnome/help
 
 %find_lang %{name}
 
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/yelp.desktop
+
 %post
 update-desktop-database &> /dev/null ||:
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
@@ -111,7 +109,7 @@ gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
 %files -f %{name}.lang
 %doc ChangeLog AUTHORS COPYING MAINTAINERS NEWS README
 %{_bindir}/*
-%{_datadir}/applications/*
+%{_datadir}/applications/yelp.desktop
 %dir %{_datadir}/gnome/help
 %{_datadir}/yelp
 %{_datadir}/glib-2.0/schemas/org.gnome.yelp.gschema.xml
@@ -127,6 +125,9 @@ gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Fri Feb 22 2013 Kalev Lember <kalevlember at gmail.com> - 1:3.7.90-2
+- Remove the desktop file vendor prefix
+
 * Tue Feb 19 2013 Richard Hughes <rhughes at redhat.com> - 1:3.7.90-1
 - Update to 3.7.90
 


More information about the scm-commits mailing list