rpms/supertuxkart/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 supertuxkart-0.3-default-fs.patch, 1.2, 1.3 supertuxkart-0.3-desktop.patch, 1.4, 1.5 supertuxkart-fhs.patch, 1.3, 1.4 supertuxkart.spec, 1.10, 1.11 supertuxkart-images-legal.txt, 1.2, NONE

Sun Jan 25 20:19:39 UTC 2009

Author: jwrdegoede

Update of /cvs/extras/rpms/supertuxkart/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv696

Modified Files:
	.cvsignore sources supertuxkart-0.3-default-fs.patch 
	supertuxkart-0.3-desktop.patch supertuxkart-fhs.patch 
	supertuxkart.spec 
Removed Files:
	supertuxkart-images-legal.txt 
Log Message:
* Sun Jan 25 2009 Hans de Goede <hdegoede at redhat.com> 0.6-1
- New upstream release 0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	9 Jun 2008 18:24:14 -0000	1.5
+++ .cvsignore	25 Jan 2009 20:19:08 -0000	1.6
@@ -1,2 +1 @@
-supertuxkart-0.5.tar.bz2
-supertuxkart-alt-images.tar.gz
+supertuxkart-0.6-src.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jun 2008 18:24:14 -0000	1.5
+++ sources	25 Jan 2009 20:19:08 -0000	1.6
@@ -1,2 +1 @@
-5e11b2dd8ed3aa3ebe65294da6a42942  supertuxkart-0.5.tar.bz2
-d08eab1c9abd427a24486e84ce58a674  supertuxkart-alt-images.tar.gz
+4b6bd4cc415424423282f491ecdffcc4  supertuxkart-0.6-src.tar.bz2

supertuxkart-0.3-default-fs.patch:

Index: supertuxkart-0.3-default-fs.patch
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-0.3-default-fs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- supertuxkart-0.3-default-fs.patch	10 Mar 2008 22:02:46 -0000	1.2
+++ supertuxkart-0.3-default-fs.patch	25 Jan 2009 20:19:08 -0000	1.3
@@ -1,12 +1,12 @@
-diff -up supertuxkart-0.4/src/user_config.cpp.fs supertuxkart-0.4/src/user_config.cpp
---- supertuxkart-0.4/src/user_config.cpp.fs	2008-03-05 05:16:12.000000000 +0100
-+++ supertuxkart-0.4/src/user_config.cpp	2008-03-10 09:52:53.000000000 +0100
-@@ -117,7 +117,7 @@ void UserConfig::setDefaults()
-     m_keyboard_debug   = false;
-     m_track_debug      = 0;
-     m_bullet_debug     = false;
--    m_fullscreen       = false;
-+    m_fullscreen       = true;
-     m_no_start_screen  = false;
-     m_sfx              = UC_ENABLE;
-     m_music            = UC_ENABLE;
+diff -up supertuxkart-0.6/src/user_config.cpp~ supertuxkart-0.6/src/user_config.cpp
+--- supertuxkart-0.6/src/user_config.cpp~	2009-01-25 16:10:22.000000000 +0100
++++ supertuxkart-0.6/src/user_config.cpp	2009-01-25 16:10:22.000000000 +0100
+@@ -95,7 +95,7 @@ void UserConfig::setDefaults()
+     m_gamepad_debug     = false;
+     m_track_debug       = 0;
+     m_bullet_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:

Index: supertuxkart-0.3-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-0.3-desktop.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- supertuxkart-0.3-desktop.patch	9 Jun 2008 18:24:14 -0000	1.4
+++ supertuxkart-0.3-desktop.patch	25 Jan 2009 20:19:08 -0000	1.5
@@ -1,6 +1,8 @@
---- supertuxkart-0.4/data/supertuxkart_desktop.template	2008-03-05 23:45:56.000000000 +0100
-+++ supertuxkart-0.4/data/supertuxkart_desktop.template	2008-03-10 09:50:51.000000000 +0100
-@@ -1,15 +1,12 @@
+diff -up supertuxkart-0.6/data/supertuxkart_desktop.template~ supertuxkart-0.6/data/supertuxkart_desktop.template
+--- supertuxkart-0.6/data/supertuxkart_desktop.template~	2009-01-25 16:08:25.000000000 +0100
++++ supertuxkart-0.6/data/supertuxkart_desktop.template	2009-01-25 16:08:25.000000000 +0100
+@@ -1,17 +1,12 @@
+-
  [Desktop Entry]
 -Encoding=UTF-8
  Name=Supertuxkart
@@ -18,4 +20,5 @@
  Type=Application
 -TryExec=PREFIX/games/supertuxkart
 -Categories=Game;ArcadeGame
+-GenericName=
 +Categories=Game;ActionGame;SportsGame;

supertuxkart-fhs.patch:

Index: supertuxkart-fhs.patch
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart-fhs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- supertuxkart-fhs.patch	8 Sep 2008 14:27:40 -0000	1.3
+++ supertuxkart-fhs.patch	25 Jan 2009 20:19:08 -0000	1.4
@@ -1,24 +1,24 @@
-diff -up supertuxkart-0.5/src/Makefile.am.foo supertuxkart-0.5/src/Makefile.am
---- supertuxkart-0.5/src/Makefile.am.foo	2008-09-08 16:25:21.000000000 +0200
-+++ supertuxkart-0.5/src/Makefile.am	2008-09-08 16:25:26.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@
+diff -up supertuxkart-0.6/src/Makefile.am.fhs supertuxkart-0.6/src/Makefile.am
+--- supertuxkart-0.6/src/Makefile.am.fhs	2009-01-20 00:47:29.000000000 +0100
++++ supertuxkart-0.6/src/Makefile.am	2009-01-25 16:00:40.000000000 +0100
+@@ -5,7 +5,7 @@ SUBDIRS = ide
+ bindir=$(prefix)/games
+ bin_PROGRAMS = supertuxkart
  
--AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/games/@PACKAGE@/\""
-+AM_CPPFLAGS=-DSUPERTUXKART_DATADIR="\"$(datadir)/@PACKAGE@/\""
+-AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\""  \
++AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/$(PACKAGE)/\""  \
+  -I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/
  
- supertuxkart_SOURCES =             main.cpp  			\
- 	actionmap.cpp		   actionmap.hpp		\
-diff -up supertuxkart-0.5/src/Makefile.in.foo supertuxkart-0.5/src/Makefile.in
---- supertuxkart-0.5/src/Makefile.in.foo	2008-09-08 16:25:21.000000000 +0200
-+++ supertuxkart-0.5/src/Makefile.in	2008-09-08 16:25:26.000000000 +0200
-@@ -267,7 +267,7 @@ top_srcdir = @top_srcdir@
- noinst_LIBRARIES = libstatic_ssg.a
- 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  			\
- 	actionmap.cpp		   actionmap.hpp		\
- 	material.cpp		   material.hpp           	\
+ supertuxkart_SOURCES = \
+diff -up supertuxkart-0.6/src/Makefile.in.fhs supertuxkart-0.6/src/Makefile.in
+--- supertuxkart-0.6/src/Makefile.in.fhs	2009-01-21 23:13:59.000000000 +0100
++++ supertuxkart-0.6/src/Makefile.in	2009-01-25 16:00:59.000000000 +0100
+@@ -269,7 +269,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = ide
+-AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\""  \
++AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/$(PACKAGE)/\""  \
+  -I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/
+ 
+ supertuxkart_SOURCES = \


Index: supertuxkart.spec
===================================================================
RCS file: /cvs/extras/rpms/supertuxkart/devel/supertuxkart.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- supertuxkart.spec	8 Sep 2008 14:27:40 -0000	1.10
+++ supertuxkart.spec	25 Jan 2009 20:19:08 -0000	1.11
@@ -1,14 +1,12 @@
 Name:           supertuxkart
-Version:        0.5
-Release:        2%{?dist}
+Version:        0.6
+Release:        1%{?dist}
 Summary:        Kids 3D go-kart racing game featuring Tux
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://supertuxkart.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1:        %{name}-alt-images.tar.gz
-Source2:        %{name}-images-legal.txt
-Source3:        %{name}.6
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
+Source1:        %{name}.6
 Patch0:         supertuxkart-fhs.patch
 Patch1:         supertuxkart-0.3-desktop.patch
 Patch2:         supertuxkart-0.3-default-fs.patch
@@ -29,13 +27,14 @@
 
 
 %prep
-%setup -q -a 1
+%setup -q
 %patch0 -p1 -z .fhs
 %patch1 -p1 -z .desktop
 %patch2 -p1 -z .fs
-cp -a %{SOURCE2} .
-chmod -x AUTHORS COPYING ChangeLog README TODO src/robots/default_robot.* \
-  src/sdldrv.cpp
+# some cleanups
+chmod -x AUTHORS COPYING ChangeLog README TODO
+chmod -x `find -name "*.cpp" -o -name "*.hpp"`
+rm -fr data/karts/*/.svn data/karts/.svn
 # stop automake from rerunning because of our patches above
 touch src/Makefile.in
 
@@ -52,6 +51,12 @@
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_prefix}/games/%{name} $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_datadir}/games/%{name} $RPM_BUILD_ROOT%{_datadir}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/data/po $RPM_BUILD_ROOT%{_datadir}/locale
+rm $RPM_BUILD_ROOT%{_datadir}/locale/*.po
+rm $RPM_BUILD_ROOT%{_datadir}/locale/%{name}.pot
+ln -s ../../locale $RPM_BUILD_ROOT%{_datadir}/%{name}/data/po
+
+%find_lang %{name}
 
 ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
 
@@ -69,7 +74,7 @@
 
 # add the manpage (courtesy of Debian)
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
-install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man6
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6
 
 # remove the installed docs (we include them through %doc)
 rm -r $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
@@ -92,10 +97,9 @@
 fi
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README TODO %{name}-images-legal.txt
-%doc doc/players_manual
+%doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/%{name}*
 %{_datadir}/%{name}
 %{_mandir}/man6/%{name}.6.gz
@@ -104,6 +108,9 @@
 
 
 %changelog
+* Sun Jan 25 2009 Hans de Goede <hdegoede at redhat.com> 0.6-1
+- New upstream release 0.6
+
 * Sun Sep  7 2008 Hans de Goede <hdegoede at redhat.com> 0.5-2
 - Fix patch fuzz build failure
 


--- supertuxkart-images-legal.txt DELETED ---


