rpms/shippy/devel shippy.desktop,1.1,1.2 shippy.spec,1.4,1.5

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

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



Index: shippy.desktop
===================================================================
RCS file: /cvs/extras/rpms/shippy/devel/shippy.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shippy.desktop	31 Mar 2006 08:18:18 -0000	1.1
+++ shippy.desktop	12 Aug 2007 10:02:44 -0000	1.2
@@ -1,12 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Shippy 1984
-GenericName=Space invaders / Galaxians like game
 Comment=Galaxians with powerups!
 Exec=shippy
 Icon=shippy.png
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;ArcadeGame;
-Version=1.3.3.7
+Categories=Game;ArcadeGame;


Index: shippy.spec
===================================================================
RCS file: /cvs/extras/rpms/shippy/devel/shippy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- shippy.spec	29 Aug 2006 06:04:51 -0000	1.4
+++ shippy.spec	12 Aug 2007 10:02:44 -0000	1.5
@@ -1,18 +1,18 @@
 Name:           shippy
 Version:        1.3.3.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Space invaders / Galaxians like game with powerups
 Group:          Amusements/Games
-License:        GPL
+License:        GPL+
 URL:            http://www.shippysite.com/
-Source0:        http://download.sourceforge.net/ship84/shipv%{version}UNIX.zip
+Source0:        http://downloads.sourceforge.net/ship84/shipv%{version}UNIX.zip
 Source1:        shippy.png
 Source2:        shippy.desktop
 Source3:        shippy.sh
 Patch0:         shippy-merged.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  dumb-devel SDL_mixer-devel desktop-file-utils
-Requires:	%{name}-common = %{version}
+Requires:       %{name}-common = %{version}, hicolor-icon-theme
 Provides:       %{name}-engine = %{version}
 
 %description
@@ -46,7 +46,7 @@
 %prep
 %setup -q -c
 %patch0 -p1 -z .merged
-%{__sed} -i 's/\r//' NOTES.txt LICENSE.txt docs/manual.html
+sed -i 's/\r//' NOTES.txt LICENSE.txt docs/manual.html
 mv docs html
 #see comment in %%install
 rm data/scores.lst
@@ -82,7 +82,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora            \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
   %{SOURCE2}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
 install -p -m 644 %{SOURCE1} \
@@ -125,6 +124,10 @@
 
 
 %changelog
+* Sun Aug 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.91-2
+- 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.3.3.7-4
 - FE6 Rebuild