[zeroinstall-injector/f17] Adjust for desktop file changes (cherry picked from commit e8e0f90aa3eb39c06acd4f285aef405d755c45ab)

[Michel Alexandre Salim]

commit ce6e02efce9b8fa78f31967430049791ba8c75ec
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Tue May 7 13:46:14 2013 +0700

    Adjust for desktop file changes
    (cherry picked from commit e8e0f90aa3eb39c06acd4f285aef405d755c45ab)

 zeroinstall-injector.spec |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/zeroinstall-injector.spec b/zeroinstall-injector.spec
index d89cc23..958aab0 100644
--- a/zeroinstall-injector.spec
+++ b/zeroinstall-injector.spec
@@ -62,16 +62,9 @@ rm -rf $RPM_BUILD_ROOT
 mv "$RPM_BUILD_ROOT/usr/man" "$RPM_BUILD_ROOT/%{_datadir}/man"
 mkdir -p "$RPM_BUILD_ROOT%{cache_dir}/implementations"
 
-for i in add manage; do
-  desktop-file-install \
-%if 0%{!?fedora:1}
-    --vendor="" \
-%endif
-    --add-category="System" \
-    --delete-original \
-    --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-    $RPM_BUILD_ROOT%{_datadir}/applications/zeroinstall-$i.desktop
-done
+desktop-file-validate \
+    $RPM_BUILD_ROOT%{_datadir}/applications/0install.desktop
+
 %find_lang zero-install
 
 %check
@@ -113,9 +106,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-,root,root,-)
 %doc COPYING README.md
 %{_bindir}/0*
-%config(noreplace) %{_sysconfdir}/xdg/menus/applications-merged/zeroinstall.menu
 %{_datadir}/applications/*.desktop
-%{_datadir}/desktop-directories/zeroinstall.directory
 %{_datadir}/icons/hicolor/*/apps/zeroinstall.png
 %{_datadir}/icons/hicolor/scalable/apps/zeroinstall.svg
 %{python_sitelib}/zeroinstall/