Wed Aug 15 12:14:05 UTC 2007

Author: jwrdegoede

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

Modified Files:
	.cvsignore sources supertuxkart-fhs.patch supertuxkart.spec 
Added Files:
	supertuxkart-0.3-default-fs.patch 
	supertuxkart-0.3-desktop.patch 
Removed Files:
	supertuxkart-0.2-gpmenu.patch supertuxkart-0.2-joy1.patch 
	supertuxkart-0.2-joy2.patch supertuxkart-0.2-joy3.patch 
	supertuxkart-fullscreen.patch supertuxkart-nomnm.patch 
	supertuxkart.desktop supertuxkart.png 
Log Message:
* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-1
- New upstream release 0.3
- Drop most patches (all fixed upstream)
- Update License tag for new Licensing Guidelines compliance


supertuxkart-0.3-default-fs.patch:

--- NEW FILE supertuxkart-0.3-default-fs.patch ---
diff -up supertuxkart-0.3/src/user_config.cpp~ supertuxkart-0.3/src/user_config.cpp
--- supertuxkart-0.3/src/user_config.cpp~	2007-08-15 13:45:09.000000000 +0200
+++ supertuxkart-0.3/src/user_config.cpp	2007-08-15 13:45:09.000000000 +0200
@@ -108,7 +108,7 @@ void UserConfig::setDefaults()
 {
     setFilename();
     m_keyboard_debug   = false;
-    m_fullscreen       = false;
+    m_fullscreen       = true;
     m_no_start_screen  = false;
     m_sfx              = UC_ENABLE;
     m_music            = UC_ENABLE;

supertuxkart-0.3-desktop.patch:

--- NEW FILE supertuxkart-0.3-desktop.patch ---
diff -up supertuxkart-0.3/data/supertuxkart.desktop~ supertuxkart-0.3/data/supertuxkart.desktop
--- supertuxkart-0.3/data/supertuxkart.desktop~	2007-08-15 13:08:37.000000000 +0200
+++ supertuxkart-0.3/data/supertuxkart.desktop	2007-08-15 13:08:37.000000000 +0200
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Supertuxkart
-Icon=supertuxkart_64.xpm
+Icon=supertuxkart.xpm
 Comment=A kart racing game
 Comment[fr_FR]=Un jeu de karting
 Comment[ro_RO]=Un joc de curse cu carturi
@@ -9,5 +9,4 @@ Exec=supertuxkart
 Terminal=false
 StartupNotify=false
 Type=Application
-TryExec=supertuxkart
-Categories=3DGraphics;Game;ActionGame;Simulation;SportsGame;
+Categories=Game;ActionGame;SportsGame;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2006 14:37:01 -0000	1.2
+++ .cvsignore	15 Aug 2007 12:13:32 -0000	1.3
@@ -1,2 +1,2 @@
-supertuxkart-0.2.tar.gz
+supertuxkart-0.3-src.tar.bz2
 supertuxkart-alt-images.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2006 14:37:01 -0000	1.2
+++ sources	15 Aug 2007 12:13:32 -0000	1.3
@@ -1,2 +1,2 @@
-2371aa8b3d9201c97fee901accbe7280  supertuxkart-0.2.tar.gz
-c0d4c9b055d2a95a006f60bff2058f37  supertuxkart-alt-images.tar.gz
+4db5d46206ea72abed861cd524165944  supertuxkart-0.3-src.tar.bz2
+6a0e178696d239ef0dcd724725d525f9  supertuxkart-alt-images.tar.gz

supertuxkart-fhs.patch:

Index: supertuxkart-fhs.patch
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-fhs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- supertuxkart-fhs.patch	6 Oct 2006 14:37:02 -0000	1.1
+++ supertuxkart-fhs.patch	15 Aug 2007 12:13:32 -0000	1.2
@@ -1,14 +1,3 @@
---- supertuxkart-0.2/src/Makefile.am.aap	2006-09-24 21:20:17.000000000 +0200
-+++ supertuxkart-0.2/src/Makefile.am	2006-09-24 21:20:21.000000000 +0200
-@@ -23,7 +23,7 @@
- libstatic_ssg_a_SOURCES  = static_ssg.cpp static_ssg.hpp
- libstatic_ssg_a_CXXFLAGS = @NOREGMOVE@
- 
--AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\""
-+AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/@PACKAGE@/\""
- supertuxkart_SOURCES =             main.cpp  			\
- 	material.cpp		   material.hpp           	\
- 	material_manager.cpp	   material_manager.hpp    	\
 --- supertuxkart-0.2/src/Makefile.in.aap	2006-09-24 21:20:26.000000000 +0200
 +++ supertuxkart-0.2/src/Makefile.in	2006-09-24 21:20:37.000000000 +0200
 @@ -220,7 +220,7 @@
@@ -20,3 +9,14 @@
  supertuxkart_SOURCES = main.cpp  			\
  	material.cpp		   material.hpp           	\
  	material_manager.cpp	   material_manager.hpp    	\
+--- supertuxkart-0.3/src/Makefile.am~	2007-08-15 12:00:45.000000000 +0200
++++ supertuxkart-0.3/src/Makefile.am	2007-08-15 12:00:45.000000000 +0200
+@@ -23,7 +23,7 @@ noinst_LIBRARIES         =  libstatic_ss
+ libstatic_ssg_a_SOURCES  = static_ssg.cpp static_ssg.hpp
+ libstatic_ssg_a_CXXFLAGS = @NOREGMOVE@
+ 
+-AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\""
++AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/@PACKAGE@/\""
+ 
+ supertuxkart_SOURCES =             main.cpp  			\
+ 	material.cpp		   material.hpp           	\


Index: supertuxkart.spec
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- supertuxkart.spec	6 Oct 2006 14:37:02 -0000	1.1
+++ supertuxkart.spec	15 Aug 2007 12:13:32 -0000	1.2
@@ -1,34 +1,20 @@
 Name:           supertuxkart
-Version:        0.2
-Release:        3%{?dist}
+Version:        0.3
+Release:        1%{?dist}
 Summary:        Kids 3D go-kart racing game featuring Tux
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://supertuxkart.berlios.de/
-# This is not the official upstream tarbal which can be found here:
-# http://download.berlios.de/supertuxkart/SuperTuxKart-0.2.tar.bz2
-# This version has some copyrighted / trademarked images and sounds removed,
-# these are replaced with new ones from supertuxkart-alt-images.tar.gz
-# see supertuxkart-images-legal.txt for the copyright/trademark info on the
-# new ones. The following images and sounds where replaced:
-# adverts.rgb, lunchbox.rgb, lunchbox2.rgb, mnm.rgb (with bananawrap.rgb),
-# brick.rgb, explode.rgb, mathclasswest.rgb (pokemon poster removed),
-# explode2.rgb (unused, removed), select_option.wav (unused, removed).
-Source0:        %{name}-%{version}.tar.gz
+Source0:        http://download.berlios.de/%{name}/%{name}-%{version}-src.tar.bz2
 Source1:        %{name}-alt-images.tar.gz
-Source2:        %{name}.desktop
-Source3:        %{name}.png
-Source4:        %{name}.6
-Source5:        %{name}-images-legal.txt
+Source2:        %{name}-images-legal.txt
+Source3:        %{name}.6
 Patch0:         supertuxkart-fhs.patch
-Patch1:         supertuxkart-fullscreen.patch
-Patch2:         supertuxkart-nomnm.patch
-Patch3:         supertuxkart-0.2-joy1.patch
-Patch4:         supertuxkart-0.2-joy2.patch
-Patch5:         supertuxkart-0.2-joy3.patch
-Patch6:         supertuxkart-0.2-gpmenu.patch
+Patch1:         supertuxkart-0.3-desktop.patch
+Patch2:         supertuxkart-0.3-default-fs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  plib-devel libXt-devel desktop-file-utils
+BuildRequires:  plib-devel SDL-devel freealut-devel mikmod-devel
+BuildRequires:  libvorbis-devel desktop-file-utils
 # Provide so that yum install tuxkart will work, obsolete for auto upgrade
 Provides:       tuxkart = 0.4.0-6
 Obsoletes:      tuxkart < 0.4.0-6
@@ -44,16 +30,12 @@
 %prep
 %setup -q
 %patch0 -p1 -z .fhs
-%patch1 -p1 -z .fs
-%patch2 -p1 -z .nomnm
-mv models/mnm.ac models/bananawrap.ac
-%patch3 -p1 -z .joy1
-%patch4 -p1 -z .joy2
-%patch5 -p1 -z .joy3
-%patch6 -p1 -z .gpmenu
-tar xf %{SOURCE1}
-cp %{SOURCE5} .
-chmod -x AUTHORS CHANGES COPYING README TODO
+%patch1 -p1 -z .desktop
+%patch2 -p1 -z .fs
+tar xfz %{SOURCE1}
+cp %{SOURCE2} .
+chmod -x AUTHORS COPYING ChangeLog README TODO src/robots/default_robot.* \
+  src/sdldrv.cpp
 # stop automake from rerunning because of our patches above
 touch src/Makefile.in
 
@@ -71,17 +53,19 @@
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora            \
+desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora                       \
-  %{SOURCE2}
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-install -p -m 644 %{SOURCE3} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_32.xpm \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}_64.xpm \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.xpm
 
 # add the manpage (courtesy of Debian)
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man6
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man6
 
 
 %clean
@@ -103,15 +87,20 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGES COPYING README TODO %{name}-images-legal.txt
+%doc AUTHORS COPYING ChangeLog README TODO %{name}-images-legal.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_mandir}/man6/%{name}.6.gz
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.xpm
 
 
 %changelog
+* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-1
+- New upstream release 0.3
+- Drop most patches (all fixed upstream)
+- Update License tag for new Licensing Guidelines compliance
+
 * Fri Oct  6 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.2-3
 - replace some more coprighted images and sounds
 - fix a bunch of joystick related bugs


--- supertuxkart-0.2-gpmenu.patch DELETED ---


--- supertuxkart-0.2-joy1.patch DELETED ---


--- supertuxkart-0.2-joy2.patch DELETED ---


--- supertuxkart-0.2-joy3.patch DELETED ---


--- supertuxkart-fullscreen.patch DELETED ---


--- supertuxkart-nomnm.patch DELETED ---


--- supertuxkart.desktop DELETED ---


