rpms/worminator/devel worminator.desktop, 1.1, 1.2 worminator.spec, 1.5, 1.6

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/worminator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17749

Modified Files:
	worminator.desktop worminator.spec 
Log Message:
* Sun Aug 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-6
- Update License tag for new Licensing Guidelines compliance
- Fix invalid desktop file (fix building with latest desktop-file-utils)



Index: worminator.desktop
===================================================================
RCS file: /cvs/extras/rpms/worminator/devel/worminator.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- worminator.desktop	6 Mar 2006 07:19:09 -0000	1.1
+++ worminator.desktop	12 Aug 2007 10:38:48 -0000	1.2
@@ -1,12 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Worminator
-GenericName=A sidescrolling action-game
 Comment=A jump, run and shoot action-game
 Exec=worminator
 Icon=worminator.png
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;ArcadeGame;
-Version=3.0R2.1
+Categories=Game;ArcadeGame;


Index: worminator.spec
===================================================================
RCS file: /cvs/extras/rpms/worminator/devel/worminator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- worminator.spec	29 Aug 2006 11:52:17 -0000	1.5
+++ worminator.spec	12 Aug 2007 10:38:48 -0000	1.6
@@ -1,9 +1,9 @@
 Name:           worminator
 Version:        3.0R2.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Sidescrolling platform and shoot'em up action-game
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://sourceforge.net/projects/worminator/
 Source0:        http://download.sourceforge.net/worminator/worminator-%{version}.tar.gz
 Source1:        worminator.png
@@ -11,7 +11,7 @@
 Patch0:         worminator-3.0R2.1-speed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel, desktop-file-utils
-Requires:       worminator-data >= 3.0R2.1-2
+Requires:       worminator-data >= 3.0R2.1-2, hicolor-icon-theme
 
 %description
 You play as The Worminator and fight your way through many levels of madness
@@ -22,7 +22,7 @@
 %prep
 %setup -q
 %patch -p1 -z .speed
-%{__sed} -i 's/\r//' ReadMe.txt
+sed -i 's/\r//' ReadMe.txt
 
 
 %build
@@ -42,7 +42,6 @@
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         %{SOURCE2}
 
 
@@ -72,6 +71,10 @@
 
 
 %changelog
+* Sun Aug 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-6
+- Update License tag for new Licensing Guidelines compliance
+- Fix invalid desktop file (fix building with latest desktop-file-utils)
+
 * Tue Aug 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-5
 - FE6 Rebuild