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

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

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



Index: njam.desktop
===================================================================
RCS file: /cvs/extras/rpms/njam/devel/njam.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- njam.desktop	29 Mar 2006 19:45:02 -0000	1.1
+++ njam.desktop	12 Aug 2007 09:42:39 -0000	1.2
@@ -1,12 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Njam
-GenericName=Maze-game where you must eat all the dots
-Comment=Eat all the dots while avoiding the badguys
+Comment=Eat all the cookies while avoiding the badguys
 Exec=njam
 Icon=njam.png
 Terminal=false
 StartupNotify=false
 Type=Application
-Categories=Application;Game;ArcadeGame;
-Version=1.25
+Categories=Game;ArcadeGame;


Index: njam.spec
===================================================================
RCS file: /cvs/extras/rpms/njam/devel/njam.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- njam.spec	28 Aug 2006 11:58:22 -0000	1.3
+++ njam.spec	12 Aug 2007 09:42:39 -0000	1.4
@@ -1,9 +1,9 @@
 Name:           njam
 Version:        1.25
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Maze-game, eat all the cookies while avoiding the badguys
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://njam.sourceforge.net/
 Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
 Source1:        njam.6
@@ -14,6 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel SDL_mixer-devel SDL_image-devel SDL_net-devel 
 BuildRequires:  ImageMagick desktop-file-utils
+Requires:       hicolor-icon-theme 
 
 %description
 Njam is a fast-paced maze-game where you must eat all the cookies while
@@ -62,7 +63,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/32x32/apps
 install -p -m 644 %{name}.png \
@@ -98,6 +98,10 @@
 
 
 %changelog
+* Sun Aug 12 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.25-5
+- Update License tag for new Licensing Guidelines compliance
+- Fix invalid desktop file (fix building with latest desktop-file-utils)
+
 * Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.25-4
 - FE6 Rebuild