diff --git a/.gitignore b/.gitignore index 7f8044f..22de66b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ supertuxkart-0.6.2-src.tar.bz2 addon0.6.1-1.zip +/supertuxkart-0.7-src.tar.bz2 diff --git a/sources b/sources index 73746e0..9e25d7a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -bfee9844acc2d4e168d903f6aae6d591 supertuxkart-0.6.2-src.tar.bz2 -28c2a6aff5190072e5b81b88d09126b8 addon0.6.1-1.zip +2806f271e4d37fee5ad8ca166e1ad489 supertuxkart-0.7-src.tar.bz2 diff --git a/supertuxkart-0.7-default-fs.patch b/supertuxkart-0.7-default-fs.patch new file mode 100644 index 0000000..77201f7 --- /dev/null +++ b/supertuxkart-0.7-default-fs.patch @@ -0,0 +1,11 @@ +--- supertuxkart-0.7/src/config/user_config.hpp~ 2010-11-29 22:07:54.000000000 -0600 ++++ supertuxkart-0.7/src/config/user_config.hpp 2010-12-22 07:56:11.856211003 -0600 +@@ -234,7 +234,7 @@ + PARAM_PREFIX IntUserConfigParam m_height + PARAM_DEFAULT( IntUserConfigParam(600, "height", &m_video_group, "Screen/window height in pixels") ); + PARAM_PREFIX BoolUserConfigParam m_fullscreen +- PARAM_DEFAULT( BoolUserConfigParam(false, "fullscreen", &m_video_group) ); ++ PARAM_DEFAULT( BoolUserConfigParam(true, "fullscreen", &m_video_group) ); + PARAM_PREFIX IntUserConfigParam m_prev_width + PARAM_DEFAULT( IntUserConfigParam(800, "prev_width", &m_video_group, "Previous screen/window width") ); + PARAM_PREFIX IntUserConfigParam m_prev_height diff --git a/supertuxkart-fhs.patch b/supertuxkart-fhs.patch index b100ea7..2589494 100644 --- a/supertuxkart-fhs.patch +++ b/supertuxkart-fhs.patch @@ -1,21 +1,8 @@ -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)/\"" \ - -I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/ - - 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@ +--- src/Makefile.in~ 2010-12-20 17:36:42.000000000 -0600 ++++ src/Makefile.in 2010-12-22 07:49:15.250210999 -0600 +@@ -301,7 +301,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ SUBDIRS = ide -AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\"" \ +AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/$(PACKAGE)/\"" \ diff --git a/supertuxkart.spec b/supertuxkart.spec index 9df1e13..24dcc38 100644 --- a/supertuxkart.spec +++ b/supertuxkart.spec @@ -1,20 +1,21 @@ Name: supertuxkart -Version: 0.6.2 -Release: 3%{?dist} +Version: 0.7 +Release: 1%{?dist} Summary: Kids 3D go-kart racing game featuring Tux Group: Amusements/Games License: GPLv2+ and GPLv3 and CC-BY-SA URL: http://supertuxkart.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2 Source1: %{name}.6 -Source2: http://downloads.sourceforge.net/%{name}/addon0.6.1-1.zip +#Source2: http://downloads.sourceforge.net/%{name}/addon0.6.1-1.zip Patch0: supertuxkart-fhs.patch Patch1: supertuxkart-0.3-desktop.patch -Patch2: supertuxkart-0.3-default-fs.patch +#Patch2: supertuxkart-0.7-default-fs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: plib-devel SDL-devel mikmod-devel BuildRequires: libvorbis-devel freeglut-devel desktop-file-utils BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10 +BuildRequires: irrlicht-devel Requires: hicolor-icon-theme opengl-games-utils # Provide so that yum install tuxkart will work, obsolete for auto upgrade Provides: tuxkart = 0.4.0-6 @@ -39,9 +40,9 @@ This package contains the data files for SuperTuxKart, as well as the add-on pac %prep %setup -q -%patch0 -p1 -z .fhs +%patch0 -p0 -z .fhs %patch1 -p1 -z .desktop -%patch2 -p1 -z .fs +#%patch2 -p1 -z .fs # some cleanups chmod -x AUTHORS COPYING ChangeLog README TODO chmod -x `find -name "*.cpp" -o -name "*.hpp"` @@ -49,7 +50,7 @@ rm -fr data/karts/*/.svn data/karts/.svn # stop automake from rerunning because of our patches above touch src/Makefile.in -unzip %{SOURCE2} -d data/ -x karts/mriceblock* +#unzip %{SOURCE2} -d data/ -x karts/mriceblock* %build %configure @@ -133,6 +134,9 @@ fi %changelog +* Wed Dec 22 2010 Jon Ciesla - 0.7-1 +- New upstream, BZ 587194. + * Thu Jan 14 2010 Jon Ciesla - 0.6.2-3 - Rebuild for new irrlicht.