From af6fd208cdaf4491600e341ce26ec5ad64ed5d6d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Aug 15 2007 12:13:32 +0000 Subject: - New upstream release 0.3 - Drop most patches (all fixed upstream) - Update License tag for new Licensing Guidelines compliance --- diff --git a/.cvsignore b/.cvsignore index b921db2..03eb1ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -supertuxkart-0.2.tar.gz +supertuxkart-0.3-src.tar.bz2 supertuxkart-alt-images.tar.gz diff --git a/sources b/sources index c65d517..bcee55a 100644 --- a/sources +++ b/sources @@ -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 diff --git a/supertuxkart-0.2-gpmenu.patch b/supertuxkart-0.2-gpmenu.patch deleted file mode 100644 index 3e32026..0000000 --- a/supertuxkart-0.2-gpmenu.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- supertuxkart-0.2/src/gui/grand_prix_select.cpp~ 2006-10-06 14:52:51.000000000 +0200 -+++ supertuxkart-0.2/src/gui/grand_prix_select.cpp 2006-10-06 14:52:51.000000000 +0200 -@@ -43,13 +43,15 @@ - std::string fullPath= "data/" + (std::string)*i; - CupData *cup = new CupData(fullPath.c_str()); - allCups.push_back(cup); -- int tmp=widgetSet -> state(menu_id, cup->getName().c_str(), GUI_SML, nId, 0); -- if(nId==0) widgetSet->set_active(tmp); -+ if(nId==0) -+ widgetSet -> start(menu_id, cup->getName().c_str(), GUI_SML, nId, 0); -+ else -+ widgetSet -> state(menu_id, cup->getName().c_str(), GUI_SML, nId, 0); - nId++; - } // if - } // for i - widgetSet -> space(menu_id); -- widgetSet -> start(menu_id,"Press to go back", GUI_SML, -1); -+ widgetSet -> state(menu_id,"Press to go back", GUI_SML, -1); - widgetSet -> layout(menu_id, 0, 0); - rect = widgetSet->rect(10, 10, config->width-20, 34, GUI_ALL, 10); - } // GrandPrixSelect diff --git a/supertuxkart-0.2-joy1.patch b/supertuxkart-0.2-joy1.patch deleted file mode 100644 index 3dae7c1..0000000 --- a/supertuxkart-0.2-joy1.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- supertuxkart-0.2/src/gui/race_gui.cpp.joy1 2006-10-06 11:25:23.000000000 +0200 -+++ supertuxkart-0.2/src/gui/race_gui.cpp 2006-10-06 11:25:23.000000000 +0200 -@@ -144,24 +144,6 @@ - } // keybd - - // ----------------------------------------------------------------------------- --void RaceGUI::stick(const int &whichAxis, const float &value){ -- KartControl controls; -- controls.data[whichAxis] = value; -- assert(world != NULL); -- world -> getPlayerKart(0) -> incomingJoystick ( controls ); --} // stick -- --// ----------------------------------------------------------------------------- --void RaceGUI::joybuttons( int whichJoy, int hold, int presses, int releases ) { -- KartControl controls; -- controls.buttons = hold; -- controls.presses = presses; -- controls.releases = releases; -- assert(world != NULL); -- world -> getPlayerKart(whichJoy) -> incomingJoystick ( controls ); --} // joybuttons -- --// ----------------------------------------------------------------------------- - void RaceGUI::drawFPS () { - if (++fpsCounter>=50) { - fpsTimer.update(); ---- supertuxkart-0.2/src/gui/race_gui.hpp.joy1 2006-09-07 12:08:13.000000000 +0200 -+++ supertuxkart-0.2/src/gui/race_gui.hpp 2006-10-06 11:25:23.000000000 +0200 -@@ -42,8 +42,6 @@ - void select() {} - void keybd(int key); - void point(int x, int y) { (void)x; (void)y; } -- void stick (const int &whichAxis, const float &value) ; -- void joybuttons(int whichJoy, int hold, int presses, int releases ) ; - - private: - ulClock fpsTimer; ---- supertuxkart-0.2/src/plibdrv.cpp.joy1 2006-10-06 11:25:23.000000000 +0200 -+++ supertuxkart-0.2/src/plibdrv.cpp 2006-10-06 11:30:25.000000000 +0200 -@@ -27,6 +27,7 @@ - - #include "gui/menu_manager.hpp" - #include "kart_control.hpp" -+#include "world.hpp" - - /*********************************\ - * * -@@ -79,13 +80,21 @@ - static KartControl controls; - int prev_buttons = controls.buttons; - joystick->read ( &controls.buttons, controls.data) ; -- menu->stick( 0, controls.data[0]); -- menu->stick( 1, controls.data[1]); - - int changed_states = prev_buttons ^ controls.buttons; - controls.presses = controls.buttons & changed_states; - controls.releases = !controls.buttons & changed_states; -- menu->joybuttons(0, controls.buttons, controls.presses, controls.releases); -+ -+ if ( menu_manager->isCurrentMenu( MENUID_RACE ) ) -+ { -+ world -> getPlayerKart(0) -> incomingJoystick ( controls ); -+ } -+ else -+ { -+ menu->stick( 0, controls.data[0]); -+ menu->stick( 1, controls.data[1]); -+ menu->joybuttons(0, controls.buttons, controls.presses, controls.releases); -+ } - } - } - } diff --git a/supertuxkart-0.2-joy2.patch b/supertuxkart-0.2-joy2.patch deleted file mode 100644 index a9175c9..0000000 --- a/supertuxkart-0.2-joy2.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- supertuxkart-0.2/src/player_kart.cpp~ 2006-10-06 11:34:44.000000000 +0200 -+++ supertuxkart-0.2/src/player_kart.cpp 2006-10-06 13:48:28.000000000 +0200 -@@ -30,13 +30,16 @@ - // ----------------------------------------------------------------------------- - void PlayerKart::incomingJoystick (const KartControl &ctrl) { - //Steering keys(hold) -- controls.lr = -ctrl.data[0]; -- joystickWasMoved = fabsf(controls.lr)>0.01; -- controls.accel = -ctrl.data[1]; -- controls.brake = player->getButton(KC_BRAKE) & ctrl.buttons; -- controls.wheelie = player->getButton(KC_WHEELIE) & ctrl.buttons; -+ joystickWasMoved = fabsf(ctrl.data[0])>0.01; -+ if ( joystickWasMoved ) -+ controls.lr = -ctrl.data[0]; -+ -+ if (fabsf(ctrl.data[1])>0.01) -+ controls.accel = -ctrl.data[1]; - - //One time press keys; these are cleared each frame so we don't have to -+ if (player->getButton(KC_BRAKE) & ctrl.presses) controls.brake = true; -+ if (player->getButton(KC_WHEELIE)& ctrl.presses) controls.wheelie= true; - if (player->getButton(KC_RESCUE) & ctrl.presses) controls.rescue = true; - if (player->getButton(KC_FIRE) & ctrl.presses) controls.fire = true; - if (player->getButton(KC_JUMP) & ctrl.presses) controls.jump = true; -@@ -46,7 +49,9 @@ - // Only keys which must keep on working when still being pressed - // are handled here, not 'one time action' keys like fire, ... - void PlayerKart::handleKeyboard(float dt) { -- -+// Joystick steering values take precedence over keyboard, only -+// do the keyboard handling if joystick wasn't moved. -+if ( !joystickWasMoved ) { - if(!config->newKeyboardStyle) { - controls.lr = isKeyDown(player->getKey(KC_LEFT)) ? 1.0f - : isKeyDown(player->getKey(KC_RIGHT)) ? -1.0f : 0.0f; -@@ -66,6 +71,7 @@ - } // not old steering - // clamp control value to be within [-1,1] - controls.lr = std::min(1.0f, std::max(-1.0f, controls.lr)); -+} - - if(isKeyDown(player->getKey(KC_ACCEL))) controls.accel = 1.0f; - if(isKeyDown(player->getKey(KC_BRAKE))) controls.brake = true; -@@ -88,9 +94,7 @@ - - // ----------------------------------------------------------------------------- - void PlayerKart::update(float dt) { -- // Joystick values takes precedence over keyboard, only -- // do the keyboard handling if joystick wasn't moved. -- if(!joystickWasMoved) handleKeyboard(dt); -+ handleKeyboard(dt); - - if(world->getPhase()==World::START_PHASE) { - if(controls.lr!=0.0 || controls.accel!=0.0 || controls.brake!=false || diff --git a/supertuxkart-0.2-joy3.patch b/supertuxkart-0.2-joy3.patch deleted file mode 100644 index 04c945f..0000000 --- a/supertuxkart-0.2-joy3.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- supertuxkart-0.2/src/gui/main_menu.cpp~ 2006-10-06 13:57:17.000000000 +0200 -+++ supertuxkart-0.2/src/gui/main_menu.cpp 2006-10-06 13:57:17.000000000 +0200 -@@ -99,4 +99,16 @@ - } - } - -+void MainMenu::joybuttons( int whichJoy, int hold, int presses, int releases ) { -+ (void)whichJoy; (void)hold; (void)releases; -+ -+ if( presses & 2 ) { -+ select(); -+ } -+ -+ if (presses & 1) { -+ menu_manager->pushMenu(MENUID_EXITGAME); -+ } -+} -+ - /* EOF */ ---- supertuxkart-0.2/src/gui/main_menu.hpp~ 2006-10-06 13:57:13.000000000 +0200 -+++ supertuxkart-0.2/src/gui/main_menu.hpp 2006-10-06 13:57:13.000000000 +0200 -@@ -30,6 +30,7 @@ - - void select(); - void keybd(int key); -+ void joybuttons( int whichJoy, int hold, int presses, int releases ); - }; - - #endif diff --git a/supertuxkart-0.3-default-fs.patch b/supertuxkart-0.3-default-fs.patch new file mode 100644 index 0000000..1cae5c5 --- /dev/null +++ b/supertuxkart-0.3-default-fs.patch @@ -0,0 +1,12 @@ +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; diff --git a/supertuxkart-0.3-desktop.patch b/supertuxkart-0.3-desktop.patch new file mode 100644 index 0000000..75e0a39 --- /dev/null +++ b/supertuxkart-0.3-desktop.patch @@ -0,0 +1,19 @@ +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; diff --git a/supertuxkart-fhs.patch b/supertuxkart-fhs.patch index fe48706..8089a6a 100644 --- a/supertuxkart-fhs.patch +++ b/supertuxkart-fhs.patch @@ -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 \ diff --git a/supertuxkart-fullscreen.patch b/supertuxkart-fullscreen.patch deleted file mode 100644 index 2932f80..0000000 --- a/supertuxkart-fullscreen.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- supertuxkart-0.2/src/plibdrv.cpp.aap 2006-09-24 20:57:17.000000000 +0200 -+++ supertuxkart-0.2/src/plibdrv.cpp 2006-09-24 21:06:54.000000000 +0200 -@@ -37,6 +37,11 @@ - \*********************************/ - - void keyfn ( int key, int updown, int, int ) { -+ if ( (updown == PW_DOWN) && (key == '\r') && (pwGetModifiers() & PW_ALT) ) -+ { -+ pwToggleFullscreen () ; -+ return; -+ } - puKeyboard ( key, updown ) ; - } - -@@ -91,7 +96,13 @@ - - void keystroke ( int key, int updown, int, int ) { - if ( updown == PW_DOWN ) -+ { -+ if ( (key == '\r') && (pwGetModifiers() & PW_ALT) ) { -+ pwToggleFullscreen () ; -+ return; -+ } - lastKeystroke = key ; -+ } - - keyIsDown [ key ] = (updown == PW_DOWN) ; - } -@@ -122,6 +133,8 @@ - void InitPlib() { - pwInit ( 0, 0, config->width, config->height, - FALSE, "Super Tux Kart", TRUE, 0 ) ; -+ pwSetResizable ( FALSE ); -+ pwSetFullscreen () ; - - puInit () ; - ssgInit () ; ---- supertuxkart-0.2/src/gui/race_gui.cpp.noot 2006-09-24 22:01:07.000000000 +0200 -+++ supertuxkart-0.2/src/gui/race_gui.cpp 2006-09-24 22:01:13.000000000 +0200 -@@ -55,12 +55,16 @@ - fpsTimer.reset(); - fpsTimer.update(); - fpsTimer.setMaxDelta(1000); -- -+ -+ // Don't show the mouse in fullscreen mode during the race -+ pwSetCursorEx ( PW_CURSOR_LEFT, PW_CURSOR_NONE ) ; - } // RaceGUI - - // ----------------------------------------------------------------------------- - RaceGUI::~RaceGUI() { - //FIXME: does all that material stuff need freeing somehow? -+ // Show the mouse in fullscreen mode again -+ pwSetCursorEx ( PW_CURSOR_LEFT, PW_CURSOR_LEFT ) ; - } // ~Racegui - - // ----------------------------------------------------------------------------- diff --git a/supertuxkart-nomnm.patch b/supertuxkart-nomnm.patch deleted file mode 100644 index c382473..0000000 --- a/supertuxkart-nomnm.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- supertuxkart-0.2/models/mnm.ac.nomnm 2006-05-04 00:14:38.000000000 +0200 -+++ supertuxkart-0.2/models/mnm.ac 2006-09-24 21:11:28.000000000 +0200 -@@ -5,7 +5,7 @@ - OBJECT poly - name "rect" - loc 0.0261096 0.0456918 0 --texture "../images/mnm.rgb" -+texture "../images/bananawrap.rgb" - numvert 4 - -1 0 -0.6 - 1 0 -0.6 ---- supertuxkart-0.2/data/olivermath.loc.nomnm 2006-09-02 11:59:16.000000000 +0200 -+++ supertuxkart-0.2/data/olivermath.loc 2006-09-24 21:10:00.000000000 +0200 -@@ -20,8 +20,8 @@ - "backpack.ac",-12,5,{},0,{},{} - "ruler_bridge.ac",60,20,{},0,{},{} - "ruler_jump.ac",-20,20,{},160,{},{} --"mnm.ac",50,10,{},0,{},{} --"mnm.ac",-30,70,{},0,{},{} -+"bananawrap.ac",50,10,{},0,{},{} -+"bananawrap.ac",-30,70,{},0,{},{} - "paperairplane.ac",0,80,{},-40,{},{} - "teachersdesk.ac",40,75,{},0,{},{} - "teachersdesk.ac",63,95,{},90,{},{} ---- supertuxkart-0.2/data/materials.dat.nomnm 2006-09-24 21:11:00.000000000 +0200 -+++ supertuxkart-0.2/data/materials.dat 2006-09-24 21:11:07.000000000 +0200 -@@ -45,7 +45,7 @@ - "grass.rgb" N N N 0.0 Y N 0.1 N N N N - "track2.rgb" N N N 0.0 Y N 1.0 N N N N - "zipper.rgb" N N N 0.0 N N 1.0 N Y N N --"mnm.rgb" Y Y Y 0.5 N N 1.0 N Y N N -+"bananawrap.rgb" Y Y Y 0.5 N N 1.0 N Y N N - "fuzzy.rgb" Y Y Y 0.2 N N 0.5 Y N N N - "mriceblockshadow.rgb" Y Y Y 0.0 N N 1.0 Y N N N - "mriceblockicon.rgb" Y Y Y 0.0 N N 1.0 Y N N N ---- supertuxkart-0.2/src/sound.cpp~ 2006-10-06 16:18:21.000000000 +0200 -+++ supertuxkart-0.2/src/sound.cpp 2006-10-06 16:18:21.000000000 +0200 -@@ -74,7 +74,8 @@ - - //FIXME: The following 3 sounds are not used in the game yet. - sfx[SOUND_BACK_MENU ].fname = "wavs/tintagel/deselect_option.wav"; -- sfx[SOUND_SELECT_MENU ].fname = "wavs/tintagel/select_option.wav"; -+ //FIXME removed because copyrighted -+ //sfx[SOUND_SELECT_MENU ].fname = "wavs/tintagel/select_option.wav"; - sfx[SOUND_MOVE_MENU ].fname = "wavs/tintagel/move_option.wav"; - - sfx[SOUND_FULL ].fname = "wavs/tintagel/energy_bar_full.wav"; ---- supertuxkart-0.2/src/sound.hpp~ 2006-10-06 16:18:29.000000000 +0200 -+++ supertuxkart-0.2/src/sound.hpp 2006-10-06 16:18:29.000000000 +0200 -@@ -28,7 +28,7 @@ - SOUND_SHOT, SOUND_OW, SOUND_WEE, SOUND_EXPLOSION, - SOUND_BZZT, SOUND_BEEP, - SOUND_BACK_MENU, SOUND_USE_ANVIL, SOUND_USE_PARACHUTE, -- SOUND_SELECT_MENU, SOUND_MOVE_MENU, SOUND_FULL, -+ SOUND_MOVE_MENU, SOUND_FULL, - SOUND_PRESTART, SOUND_START, SOUND_MISSILE_LOCK, - SOUND_TRAFFIC_JAM, NUM_SOUNDS}; - diff --git a/supertuxkart.desktop b/supertuxkart.desktop deleted file mode 100644 index 65b9cf8..0000000 --- a/supertuxkart.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Supertuxkart -Comment=3D go-kart racing game -Exec=supertuxkart -Icon=supertuxkart.png -Terminal=false -StartupNotify=false -Type=Application -Categories=Application;Game;ArcadeGame; diff --git a/supertuxkart.png b/supertuxkart.png deleted file mode 100644 index f1bd2a8..0000000 Binary files a/supertuxkart.png and /dev/null differ diff --git a/supertuxkart.spec b/supertuxkart.spec index 070ab4f..6893737 100644 --- a/supertuxkart.spec +++ b/supertuxkart.spec @@ -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 @@ up powerups such as: (homing) missiles, magnets and portable zippers. %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 @@ mv $RPM_BUILD_ROOT%{_datadir}/games/%{name} $RPM_BUILD_ROOT%{_datadir} # 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 @@ fi %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 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 0.2-3 - replace some more coprighted images and sounds - fix a bunch of joystick related bugs