[trophy] Use supplied desktop file (with some mods)

[Bruno Wolff III]

commit 520cfa61b710c6e010b203f43131613af9623790
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sat Mar 3 11:44:32 2012 -0600

    Use supplied desktop file (with some mods)
    
    Previously we were using a desktop file provided by Fedora.
    Now we want to use the supplied desktop file with a couple
    of extra keys set.

 trophy.desktop |    9 ---------
 trophy.spec    |   10 +++++-----
 2 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/trophy.spec b/trophy.spec
index c506e45..8ddcff9 100644
--- a/trophy.spec
+++ b/trophy.spec
@@ -6,7 +6,6 @@ Group:          Amusements/Games
 License:        GPL+
 URL:            http://trophy.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:        %{name}.desktop
 Source2:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ClanLib1-devel desktop-file-utils
@@ -20,7 +19,6 @@ like shooting and dropping bombs.
 %prep
 %setup -q
 
-
 %build
 export LDFLAGS=-L%{_libdir}/ClanLib-1.0
 %configure
@@ -33,9 +31,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora            \
+desktop-file-edit --set-key=Terminal --set-value=false \
+  --set-key=StartupNotify --set-value=false
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE1}
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/96x96/apps
 install -p -m 644 %{SOURCE2} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/96x96/apps
@@ -63,7 +63,7 @@ fi
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/96x96/apps/%{name}.png