[devhelp] Remove the desktop file vendor prefix

Kalev Lember kalev at fedoraproject.org
Wed Feb 6 03:02:38 UTC 2013


commit b22f6414eb90e010e1b68d7591ff1a3df0fd2dca
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Wed Feb 6 00:50:44 2013 +0100

    Remove the desktop file vendor prefix

 devhelp.spec |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/devhelp.spec b/devhelp.spec
index a318b9a..7b79b01 100644
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -49,17 +49,14 @@ make %{?_smp_mflags} CFLAGS="$CFLAGS -fno-strict-aliasing"
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor gnome			\
-  --delete-original					\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications		\
-  $RPM_BUILD_ROOT%{_datadir}/applications/devhelp.desktop
-
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books
 
 %find_lang devhelp
 
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/devhelp.desktop
+
 %post
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
@@ -82,7 +79,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_bindir}/devhelp
 %{_libdir}/libdevhelp*.so.*
 
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/devhelp.desktop
 %{_datadir}/devhelp
 %{_datadir}/GConf/gsettings/devhelp.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.devhelp.gschema.xml
@@ -105,6 +102,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %changelog
 * Wed Feb 06 2013 Kalev Lember <kalevlember at gmail.com> - 1:3.7.5-1
 - Update to 3.7.5
+- Remove the desktop file vendor prefix
 
 * Fri Dec 21 2012 Kalev Lember <kalevlember at gmail.com> - 1:3.7.3-1
 - Update to 3.7.3


More information about the scm-commits mailing list