rpms/scorched3d/devel scorched3d.desktop, 1.1, 1.2 scorched3d.spec, 1.22, 1.23

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	scorched3d.desktop scorched3d.spec 
Log Message:
* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-4
- Update License tag for new Licensing Guidelines compliance



Index: scorched3d.desktop
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d.desktop	8 Nov 2004 05:20:12 -0000	1.1
+++ scorched3d.desktop	15 Aug 2007 09:35:27 -0000	1.2
@@ -1,9 +1,9 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Scorched 3D
 Comment=A game based on the classic DOS game Scorched Earth
 Exec=scorched3d
 Icon=scorched3d.png
 Terminal=false
 Type=Application
-Encoding=UTF-8
-Categories=Application;Game;ActionGame;StrategyGame;
+Categories=Game;ActionGame;StrategyGame;


Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- scorched3d.spec	18 Apr 2007 13:46:04 -0000	1.22
+++ scorched3d.spec	15 Aug 2007 09:35:27 -0000	1.23
@@ -1,11 +1,11 @@
 Name:           scorched3d
 Version:        40.1d
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Game based loosely on the classic DOS game Scorched Earth
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://www.scorched3d.co.uk/
-Source0:        http://dl.sf.net/%{name}/Scorched3D-%{version}-src.tar.gz
+Source0:        http://downloads.sourceforge.net/%{name}/Scorched3D-%{version}-src.tar.gz
 Source1:        %{name}.desktop
 Patch1:         %{name}-syslibs.patch
 Patch2:         %{name}-wx26.patch
@@ -68,7 +68,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 \
@@ -102,6 +101,9 @@
 
 
 %changelog
+* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-4
+- Update License tag for new Licensing Guidelines compliance
+
 * Wed Apr 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-3
 - Fix build with new ODE, scorched3d tries to force a double build of (its own
   included version of) ODE, however we use the system version which is compiled