[xfce4-notifyd/f19] Use desktop-file-validate instead of desktop-file-install; all additional categories are now in the

Christoph Wickert cwickert at fedoraproject.org
Tue Apr 23 16:26:50 UTC 2013


commit cbfcf1bded16fdf23b46b6f1e15a68e2e332ad0c
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Apr 23 18:24:52 2013 +0200

    Use desktop-file-validate instead of desktop-file-install; all additional categories are now in the file, we don't need to edit it.

 xfce4-notifyd.spec |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/xfce4-notifyd.spec b/xfce4-notifyd.spec
index 226c336..f656e1a 100644
--- a/xfce4-notifyd.spec
+++ b/xfce4-notifyd.spec
@@ -50,12 +50,7 @@ make %{?_smp_mflags} V=1
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-desktop-file-install \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-        --add-only-show-in=XFCE \
-        --add-category=X-XFCE-SettingsDialog \
-        --delete-original \
-        ${RPM_BUILD_ROOT}%{_datadir}/applications/xfce4-notifyd-config.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
 
 
@@ -75,7 +70,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files -f %{name}.lang


More information about the scm-commits mailing list