rpms/zasx/devel zasx.desktop,1.1,1.2 zasx.spec,1.3,1.4

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

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



Index: zasx.desktop
===================================================================
RCS file: /cvs/extras/rpms/zasx/devel/zasx.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zasx.desktop	3 Apr 2006 19:24:55 -0000	1.1
+++ zasx.desktop	12 Aug 2007 11:09:16 -0000	1.2
@@ -1,12 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Zasx
-GenericName=Asteroid like game
 Comment=Asteroid with powerups!
 Exec=zasx
 Icon=zasx.png
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;ArcadeGame;
-Version=1.30
+Categories=Game;ArcadeGame;


Index: zasx.spec
===================================================================
RCS file: /cvs/extras/rpms/zasx/devel/zasx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zasx.spec	29 Aug 2006 11:55:39 -0000	1.3
+++ zasx.spec	12 Aug 2007 11:09:16 -0000	1.4
@@ -1,9 +1,9 @@
 Name:           zasx
 Version:        1.30
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Asteroid like game with powerups
 Group:          Amusements/Games
-License:        GPL and freely distributable content
+License:        GPLv2+ and Freely redistributable without restriction
 URL:            http://www.bob.allegronetwork.com/zasx/index.html
 Source0:        http://www.bob.allegronetwork.com/zasx/zasx130s.zip
 Source1:        zasx.desktop
@@ -11,6 +11,7 @@
 Patch1:         zasx-1.30-datadir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  dumb-devel ImageMagick desktop-file-utils
+Requires:       hicolor-icon-theme
 
 %description
 Shoot the asteroids before they hit your ship and collect power ups to restore
@@ -22,7 +23,7 @@
 %setup -q -n Zasx
 %patch0 -p1 -z .fix
 %patch1 -p1 -z .datadir
-%{__sed} -i 's/\r//' copying.txt readme.txt docs/index.html docs/%{name}.css
+sed -i 's/\r//' copying.txt readme.txt docs/index.html docs/%{name}.css
 mv docs html
 
 
@@ -40,7 +41,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   %{SOURCE1}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
 install -p -m 644 %{name}.png \
@@ -74,6 +74,10 @@
 
 
 %changelog
+* Sun Aug 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.30-4
+- 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> 1.30-3
 - FE6 Rebuild