rpms/wormux/FC-6 wormux.spec,1.7,1.8

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/wormux/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23008/FC-6

Modified Files:
	wormux.spec 
Log Message:
Use upstream's desktop file and icon



Index: wormux.spec
===================================================================
RCS file: /cvs/extras/rpms/wormux/FC-6/wormux.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wormux.spec	9 Mar 2007 21:45:11 -0000	1.7
+++ wormux.spec	10 Mar 2007 05:32:29 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           wormux
 Version:        0.7.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        2D convivial mass murder game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.wormux.org
 Source0:        http://download.gna.org/wormux/%{name}-%{version}.tar.gz
-Source1:        %{name}.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_image-devel SDL_gfx-devel SDL_mixer-devel 
@@ -42,24 +41,18 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-cat << EOF > %{name}.desktop
-[Desktop Entry]
-Encoding=UTF-8
-Name=wormux
-Comment=Destroy everyone else on the screen
-Exec=wormux
-Icon=wormux.png
-Terminal=false
-Categories=Game;StrategyGame;
-Type=Application
-EOF
-
+sed -i -e 's/Icon=.*/Icon=wormux.png/' \
+        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor fedora \
         --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \
-        %{name}.desktop
+        --remove-category=Application \
+        --remove-category=ArcadeGame \
+        --add-category=StrategyGame \
+        --delete-original \
+        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-install -d $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
+install -d $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/
+install -p -m 644 data/%{name}_32x32.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,7 +75,7 @@
 %doc AUTHORS COPYING ChangeLog
 %{_bindir}/%{name}
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_mandir}/man6/*.6.gz
 
 %files data
@@ -92,6 +85,7 @@
 %changelog
 * Fri Mar 9 2007 Wart <wart at kobold.org> 0.7.9-2
 - Clean up desktop file categories
+- Use upstream's desktop file and icon
 
 * Sat Feb 17 2007 Wart <wart at kobold.org> 0.7.9-1
 - Update to 0.7.9