diff --git a/.gitignore b/.gitignore index 22de66b..bcfe084 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ supertuxkart-0.6.2-src.tar.bz2 addon0.6.1-1.zip /supertuxkart-0.7-src.tar.bz2 +/supertuxkart-0.7.3-src.tar.bz2 diff --git a/sources b/sources index 9e25d7a..7ef26cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2806f271e4d37fee5ad8ca166e1ad489 supertuxkart-0.7-src.tar.bz2 +502664b2ec9ad5ab88b1882fef4c074d supertuxkart-0.7.3-src.tar.bz2 diff --git a/supertuxkart-0.7.3-desktop.patch b/supertuxkart-0.7.3-desktop.patch new file mode 100644 index 0000000..878acc6 --- /dev/null +++ b/supertuxkart-0.7.3-desktop.patch @@ -0,0 +1,24 @@ +--- data/supertuxkart_desktop.template~ 2011-11-01 19:03:50.000000000 -0500 ++++ data/supertuxkart_desktop.template 2012-08-23 18:29:02.885310967 -0500 +@@ -1,16 +1,13 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=SuperTuxKart +-Version=VERSION +-Icon=PREFIX/share/pixmaps/supertuxkart_64.xpm ++Icon=supertuxkart + GenericName=A kart racing game + GenericName[de_DE]=Ein Kart-Rennspiel + GenericName[fr_FR]=Un jeu de karting + GenericName[gl]=Xogo de carreiras con karts + GenericName[ro_RO]=Un joc de curse cu carturi +-Exec=PREFIX/games/supertuxkart --log=file ++Exec=supertuxkart-wrapper --log=file + Terminal=false + StartupNotify=false + Type=Application +-TryExec=PREFIX/games/supertuxkart +-Categories=Game;ArcadeGame; +\ No newline at end of file ++Categories=Game;ActionGame;ArcadeGame; +\ No newline at end of file diff --git a/supertuxkart-0.7.3-irrlicht.patch b/supertuxkart-0.7.3-irrlicht.patch new file mode 100644 index 0000000..5ad35d4 --- /dev/null +++ b/supertuxkart-0.7.3-irrlicht.patch @@ -0,0 +1,115 @@ +--- configure~ 2011-11-13 17:46:46.000000000 -0600 ++++ configure 2012-08-23 19:10:30.455255469 -0500 +@@ -5810,12 +5810,13 @@ + # ================== + + # Check whether --with-irrlicht was given. +-if test "${with_irrlicht+set}" = set; then : +- withval=$with_irrlicht; +-fi +- +-if test "x$with_irrlicht" != "x" ; then +- CPPFLAGS="${CPPFLAGS} -I $with_irrlicht/include -I $with_irrlicht/include/irrlicht" ++#if test "${with_irrlicht+set}" = set; then : ++# withval=$with_irrlicht; ++#fi ++ ++#if test "x$with_irrlicht" != "x" ; then ++if 1==1 ; then ++ CPPFLAGS="${CPPFLAGS} -I /usr/include -I /usr/include/irrlicht18" + ac_fn_cxx_check_header_mongrel "$LINENO" "irrlicht.h" "ac_cv_header_irrlicht_h" "$ac_includes_default" + if test "x$ac_cv_header_irrlicht_h" = xyes; then : + have_irrlicht_hdr=yes +@@ -5831,7 +5832,7 @@ + # check in /usr + echo " in /usr/ : " + +- CPPFLAGS="${CPPFLAGS_Save} -I/usr/include/irrlicht" ++ CPPFLAGS="${CPPFLAGS_Save} -I/usr/include/irrlicht18" + ac_fn_cxx_check_header_mongrel "$LINENO" "irrlicht.h" "ac_cv_header_irrlicht_h" "$ac_includes_default" + if test "x$ac_cv_header_irrlicht_h" = xyes; then : + irrlicht_found_in_usr=yes +@@ -5877,7 +5878,7 @@ + + case "${host}" in + *-*-linux* ) +- irrlicht_LIBS="-L/$with_irrlicht/lib/Linux -L/$with_irrlicht/lib -lIrrlicht -lX11" ++ irrlicht_LIBS="-L/$with_irrlicht/lib/Linux -L/$with_irrlicht/lib -lIrrlicht18 -lX11" + ;; + *darwin*|*macosx*) + irrlicht_LIBS="-L/$with_irrlicht/lib/ -lIrrlicht -framework Cocoa" +--- configure~ 2012-08-23 19:12:12.000000000 -0500 ++++ configure 2012-08-23 19:14:53.395249598 -0500 +@@ -5944,9 +5944,9 @@ + } + + _ACEOF +-if ac_fn_cxx_try_run "$LINENO"; then : +- works_with_Xxf86vm="true" +-fi ++#if ac_fn_cxx_try_run "$LINENO"; then : ++# works_with_Xxf86vm="true" ++#fi + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext + fi +--- configure~ 2012-08-23 19:14:53.000000000 -0500 ++++ configure 2012-08-23 19:16:05.701247989 -0500 +@@ -5960,9 +5960,9 @@ + ;; + esac + +-if test x$irrlicht_sample_built_fine = xfalse; then +-as_fn_error $? "Cann not build test irrLicht program. Check config.log to see the errors" "$LINENO" 5 +-fi ++#if test x$irrlicht_sample_built_fine = xfalse; then ++#as_fn_error $? "Cann not build test irrLicht program. Check config.log to see the errors" "$LINENO" 5 ++#fi + + # ---- Check we have the minimum required irrLicht version + echo -n "checking irrlicht version is recent enough... " +--- configure~ 2012-08-23 19:16:05.000000000 -0500 ++++ configure 2012-08-23 19:16:46.565247075 -0500 +@@ -5967,7 +5967,7 @@ + # ---- Check we have the minimum required irrLicht version + echo -n "checking irrlicht version is recent enough... " + +-irrlicht_min_version_met="false" ++irrlicht_min_version_met="true" + + # Note that irrlicht 1.8 potentially needs additional flags (-lXcursor, or + # undefine _IRR_LINUX_XCURSOR_ # in IrrCompileConfig.h). Since there might +--- configure~ 2012-08-23 19:16:46.000000000 -0500 ++++ configure 2012-08-23 19:17:35.146245990 -0500 +@@ -6005,13 +6005,13 @@ + fi + + +-if test x$irrlicht_min_version_met = xfalse; then +- as_fn_error $? "Your irrLicht is too old, please update irrLicht. +-You need irrlicht 1.8. +-While irrlicht 1.8 is not released, we recommend using version 3843 from irrlicht SVN trunk." "$LINENO" 5 +-else +- echo "yes" +-fi ++#if test x$irrlicht_min_version_met = xfalse; then ++# as_fn_error $? "Your irrLicht is too old, please update irrLicht. ++#You need irrlicht 1.8. ++#While irrlicht 1.8 is not released, we recommend using version 3843 from irrlicht SVN trunk." "$LINENO" 5 ++#else ++echo "yes" ++#fi + + LIBS=$save_LIBS + +--- configure~ 2012-08-23 19:17:35.000000000 -0500 ++++ configure 2012-08-23 19:21:07.266241262 -0500 +@@ -5872,7 +5872,7 @@ + fi + fi + +- CPPFLAGS="${CPPFLAGS_Save} -I ${with_irrlicht}/include/irrlicht" ++ CPPFLAGS="${CPPFLAGS_Save} -I ${with_irrlicht}/include/irrlicht18" + + fi + diff --git a/supertuxkart.spec b/supertuxkart.spec index 09a09e3..cec16a6 100644 --- a/supertuxkart.spec +++ b/supertuxkart.spec @@ -1,22 +1,20 @@ Name: supertuxkart -Version: 0.7 -Release: 6%{?dist} +Version: 0.7.3 +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 Patch0: supertuxkart-fhs.patch -Patch1: supertuxkart-0.3-desktop.patch -#Patch2: supertuxkart-0.7-default-fs.patch -#Patch3: supertuxkart-0.7-dsolink-irrlicht.patch +Patch1: supertuxkart-0.7.3-desktop.patch +Patch2: supertuxkart-0.7.3-irrlicht.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 +BuildRequires: irrlicht18-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 @@ -37,14 +35,13 @@ Requires: %{name} = %{version} BuildArch: noarch %description data -This package contains the data files for SuperTuxKart, as well as the add-on pack. +This package contains the data files for SuperTuxKart. %prep %setup -q %patch0 -p0 -z .fhs -%patch1 -p1 -z .desktop -#%patch2 -p1 -z .fs -#%patch3 -p0 -z .dsoir +%patch1 -p0 -z .desktop +%patch2 -p0 -z .irrlicht # some cleanups chmod -x AUTHORS COPYING ChangeLog README TODO chmod -x `find -name "*.cpp" -o -name "*.hpp"` @@ -52,26 +49,19 @@ 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* - %build +CPPFLAGS="${CPPFLAGS} -I $with_irrlicht/include -I $with_irrlicht/include/irrlicht18" %configure -make %{?_smp_mflags} LDFLAGS=-lGLU irrlicht_LIBS="-lIrrlicht -lIrrXML" +make %{?_smp_mflags} LDFLAGS=-lGLU irrlicht_LIBS="-lIrrlicht18 -lIrrXML18" %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -# easier then patching all the Makefile's +# easier then patching all the Makefiles 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 @@ -121,7 +111,7 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then fi -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README TODO %{_bindir}/%{name}* @@ -132,10 +122,12 @@ fi %files data %defattr(-,root,root,-) %{_datadir}/%{name} -%ghost %{_datadir}/%{name}/data/po %changelog +* Thu Aug 23 2012 Jon Ciesla - 0.7.3-1 +- Latest upstream, using irrlicht snapshot subpackage. BZ 697169. + * Sat Jul 21 2012 Fedora Release Engineering - 0.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild