- up to 0.8

diff --git a/supertuxkart-desktop.patch b/supertuxkart-desktop.patch
index 659451609b65eb8a4ced2e06dd64c140f7e77390..f21148542f445b8785cb17e2eb54328a4975da78 100644 (file)
--- a/supertuxkart-desktop.patch
+++ b/supertuxkart-desktop.patch
@@ -1,27 +1,25 @@
 --- supertuxkart-0.6/data/supertuxkart_desktop.template~       2009-01-22 14:42:20.000000000 +0100
 +++ supertuxkart-0.6/data/supertuxkart_desktop.template        2009-01-22 14:42:21.000000000 +0100
-@@ -1,17 +1,15 @@
--
+@@ -1,15 +1,16 @@
  [Desktop Entry]
  Encoding=UTF-8
- Name=Supertuxkart
--Version=0.5
--Icon=PREFIX/share/pixmaps/supertuxkart_64.xpm
+ Name=SuperTuxKart
+-Icon=@PREFIX@/share/pixmaps/supertuxkart_64.xpm
 +Icon=supertuxkart_32.xpm
- Comment=A kart racing game
--Comment[fr_FR]=Un jeu de karting
--Comment[ro_RO]=Un joc de curse cu carturi
--Comment[de_DE]=Ein Kart-Rennspiel
--Exec=PREFIX/games/supertuxkart --log=file
-+Comment[fr]=Un jeu de karting
-+Comment[ro]=Un joc de curse cu carturi
-+Comment[de]=Ein Kart-Rennspiel
-+Comment[pl]=Gra wyścigowa
-+Exec=supertuxkart
+ GenericName=A kart racing game
+-GenericName[de_DE]=Ein Kart-Rennspiel
+-GenericName[fr_FR]=Un jeu de karting
++GenericName[de]=Ein Kart-Rennspiel
++GenericName[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
++GenericName[ro]=Un joc de curse cu carturi
++GenericName[pl]=Gra wyścigowa
++Exec=supertuxkart --log=file
  Terminal=false
  StartupNotify=false
  Type=Application
--TryExec=PREFIX/games/supertuxkart
- Categories=Game;ArcadeGame
--GenericName=
+-TryExec=@PREFIX@/games/supertuxkart
+ Categories=Game;ArcadeGame;
 +# vi: encoding=utf-8

diff --git a/supertuxkart-duplicate_files.patch b/supertuxkart-duplicate_files.patch
deleted file mode 100644 (file)
index c581917..0000000
--- a/supertuxkart-duplicate_files.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- supertuxkart-0.7alpha2/data/Makefile.am~   2010-06-07 13:50:17.795655705 +0200
-+++ supertuxkart-0.7alpha2/data/Makefile.am    2010-06-07 13:51:07.825651246 +0200
-@@ -6,7 +6,6 @@
- dist_pkgdata_DATA = \
-  $(shell find $(srcdir) -name "*.data")                  \
-  $(shell find $(srcdir) -name "*.items")                 \
-- $(shell find $(srcdir) -name "*.projectile")            \
-  $(shell find $(srcdir) -name "*.cup")                   \
-  $(shell find $(srcdir) -maxdepth 1 -name "*.challenge") \
-  $(shell find $(srcdir) -name "*.collectable")           \

diff --git a/supertuxkart-gettext.patch b/supertuxkart-gettext.patch
deleted file mode 100644 (file)
index 0555737..0000000
--- a/supertuxkart-gettext.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- supertuxkart-0.7alpha3/configure.ac~       2010-09-24 03:21:15.000000000 +0200
-+++ supertuxkart-0.7alpha3/configure.ac        2010-09-29 13:23:49.776109670 +0200
-@@ -404,7 +404,7 @@
- # =================
- # Check for gettext
- # =================
--CHECK_GETTEXT(external)
-+#CHECK_GETTEXT(external)
- #disable/enable addons support
- AC_ARG_WITH(addons,[AS_HELP_STRING([--with-addons],
-               [This option is used to enable/disable addons support])])
---- supertuxkart-0.7alpha3/src/utils/translation.cpp~  2010-09-24 01:27:23.000000000 +0200
-+++ supertuxkart-0.7alpha3/src/utils/translation.cpp   2010-09-29 13:24:44.236109680 +0200
-@@ -33,6 +33,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <iostream>
-+#include <libintl.h>
- 
- #include "irrlicht.h"
- 
-@@ -113,12 +114,7 @@
-     #endif
- #endif
-     
--#if ENABLE_NLS
-     const char* original_t = gettext(original);
--#else
--    m_converted_string = core::stringw(original);
--    return m_converted_string.c_str();
--#endif
- 
-     /*
-     std::cout << "--> original_t==original ? " << (original_t==original) << std::endl;

diff --git a/supertuxkart-useless_files.patch b/supertuxkart-useless_files.patch
index 3eff2ff1594b2e4e12c2a8cf74ec5369185871e8..912f0f394c0e02f0ae4165d2ceca476f7e87fca0 100644 (file)
--- a/supertuxkart-useless_files.patch
+++ b/supertuxkart-useless_files.patch
@@ -1,13 +1,3 @@
---- supertuxkart-0.6/Makefile.am~      2009-01-22 14:44:06.000000000 +0100
-+++ supertuxkart-0.6/Makefile.am       2009-01-22 14:47:14.000000000 +0100
-@@ -7,7 +7,5 @@
-  README.macosx \
-  README.windows
- 
--pkgdatadir=$(datadir)/doc/$(PACKAGE)
--dist_pkgdata_DATA=AUTHORS ChangeLog COPYING README
- # NEWS only contains "see changelog"
- # CHANGES only contains "see NEW"
 --- supertuxkart-0.6/data/Makefile.am~ 2009-01-22 14:44:06.000000000 +0100
 +++ supertuxkart-0.6/data/Makefile.am  2009-01-22 14:49:00.000000000 +0100
 @@ -17,7 +17,7 @@

diff --git a/supertuxkart.spec b/supertuxkart.spec
index b312691f45fae7c0e3c9102cd24580d3d289a6fb..7a30abe697d3c717b7af6962c54334d76ae810c4 100644 (file)
--- a/supertuxkart.spec
+++ b/supertuxkart.spec
@@ -3,16 +3,14 @@
 Summary:       SuperTuxKart - an enhanced version of TuxKart
 Summary(pl.UTF-8):     SuperTuxKart - ulepszona wersja gry TuxKart
 Name:          supertuxkart
-Version:       0.7
-Release:       4
+Version:       0.8
+Release:       1
 License:       GPL v1, GPL v2, GPL v3+, CC-BY-SA v3, CC-BY-SA v3+
 Group:         X11/Applications/Games
 Source0:       http://downloads.sourceforge.net/supertuxkart/%{name}-%{version}-src.tar.bz2
-# Source0-md5: 2806f271e4d37fee5ad8ca166e1ad489
+# Source0-md5: 0b939ce601374758938119e0b0dd1fec
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-useless_files.patch
-Patch2:                %{name}-gettext.patch
-Patch3:                %{name}-duplicate_files.patch
 URL:           http://supertuxkart.sourceforge.net/
 BuildRequires: OpenAL-devel
 BuildRequires: OpenGL-devel
@@ -38,11 +36,9 @@ Steve'a Bakera, w której bierzemy udział w wyścigach gokartowych jako
 Tux lub jego przyjaciele.
 
 %prep
-%setup -q
+%setup -q -n SuperTuxKart-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %{__sed} -i -e 's#$(prefix)/games#%{_bindir}#' src/Makefile.am
 
 %build
@@ -66,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog NEWS README TODO data/CREDITS
+%doc ChangeLog README TODO data/CREDITS
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/games/%{name}
 %{_desktopdir}/%{name}.desktop