From 6a125ec31eafdb681af71398e71f1a858ec96af6 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Jul 04 2009 17:17:49 +0000 Subject: - reenable and rebrand the ship sinking game and the snake duel game (#502359) --- diff --git a/kdegames-4.2.95-kbattleship-ktron.patch b/kdegames-4.2.95-kbattleship-ktron.patch deleted file mode 100644 index ea20e25..0000000 --- a/kdegames-4.2.95-kbattleship-ktron.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up kdegames-4.2.95/CMakeLists.txt.orig kdegames-4.2.95/CMakeLists.txt ---- kdegames-4.2.95/CMakeLists.txt.orig 2009-06-30 13:15:20.000000000 +0200 -+++ kdegames-4.2.95/CMakeLists.txt 2009-06-30 13:15:46.000000000 +0200 -@@ -52,7 +52,6 @@ macro_optional_add_subdirectory(bovo) - macro_optional_add_subdirectory(lskat) - macro_optional_add_subdirectory(kapman) - macro_optional_add_subdirectory(katomic) --macro_optional_add_subdirectory(kbattleship) - macro_optional_add_subdirectory(kblackbox) - macro_optional_add_subdirectory(kblocks) - macro_optional_add_subdirectory(kbounce) -@@ -81,7 +80,6 @@ macro_optional_add_subdirectory(kspacedu - macro_optional_add_subdirectory(ksquares) - macro_optional_add_subdirectory(ksudoku) - macro_optional_add_subdirectory(ktuberling) --macro_optional_add_subdirectory(ktron) - if(OPENGL_SUPPORT) - macro_optional_add_subdirectory(kubrick) - endif(OPENGL_SUPPORT) -diff -up kdegames-4.2.95/doc/CMakeLists.txt.orig kdegames-4.2.95/doc/CMakeLists.txt ---- kdegames-4.2.95/doc/CMakeLists.txt.orig 2009-06-30 13:16:04.000000000 +0200 -+++ kdegames-4.2.95/doc/CMakeLists.txt 2009-06-30 13:16:17.000000000 +0200 -@@ -1,6 +1,5 @@ - add_subdirectory(katomic) - add_subdirectory(bovo) --add_subdirectory(kbattleship) - add_subdirectory(kblackbox) - add_subdirectory(kblocks) - add_subdirectory(kbounce) -@@ -21,7 +20,6 @@ add_subdirectory(kpat) - add_subdirectory(kreversi) - add_subdirectory(ksame) - add_subdirectory(kshisen) --add_subdirectory(ktron) - add_subdirectory(ksirk) - add_subdirectory(kspaceduel) - add_subdirectory(ksquares) diff --git a/kdegames-4.2.95-trademarks.patch b/kdegames-4.2.95-trademarks.patch new file mode 100644 index 0000000..3c10ccb --- /dev/null +++ b/kdegames-4.2.95-trademarks.patch @@ -0,0 +1,419 @@ +diff -ur kdegames-4.2.95/doc/kbattleship/index.docbook kdegames-4.2.95-trademarks/doc/kbattleship/index.docbook +--- kdegames-4.2.95/doc/kbattleship/index.docbook 2009-02-26 10:11:22.000000000 +0100 ++++ kdegames-4.2.95-trademarks/doc/kbattleship/index.docbook 2009-07-04 18:48:45.000000000 +0200 +@@ -1,6 +1,6 @@ + + ++ KSinkShips"> + + + +@@ -8,7 +8,7 @@ + + + +-The &kbattleship; Handbook ++The &kappname; Handbook + + + +@@ -57,16 +57,17 @@ + + + +-&kbattleship; is a network-enabled implementation of the famous Battle Ship game for &kde;. ++&kappname; is a network-enabled implementation of the famous ship sinking game for &kde;. + + + + KDE + kdegames +-kbattleship ++ksinkships + game +-battleship +-battle ++sinkships ++sink ++ships + + + +@@ -76,7 +77,7 @@ + Gametype:Strategy, Board + Number of possible players:Two + +-&kbattleship; is a Battle Ship game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others ++&kappname; is a ship sinking game for &kde;. Ships are placed on a board which represents the sea. Players try to hit each others + ships in turns without knowing where they are placed. The first player to destroy all ships wins the game. + + +@@ -85,14 +86,14 @@ + How to Play + Objective:Sink all of the opponent’s ships before the opponent sink all the ships of your own. + +-If you want to play &kbattleship;, you will need two players, either play ++If you want to play &kappname;, you will need two players, either play + against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select Single player on the welcome screen, or directly on the Game menu. + + + To start a network game, one player has to host the game by selecting Host network game on the welcome screen, or choosing Game + Host Game.... + A dialog box opens which asks for a Nickname: and Port:. Normally, +-&kbattleship; will suggest your full name, but you can enter any string ++&kappname; will suggest your full name, but you can enter any string + you want. The predefined port should be ok. However, if you encounter + problems, you can choose any other free port above 1024. + +@@ -186,10 +187,10 @@ + Multiplayer support + + +-&kbattleship; can be played online on any GGZ Gaming Zone site. You can ++&kappname; can be played online on any GGZ Gaming Zone site. You can + find other players there, and compete against them. Just enter one +-of the available Battleship rooms with any GGZ core client, such as +-kggz, and &kbattleship; will be offered to you as your favourite ++of the available rooms with any GGZ core client, such as ++kggz, and &kappname; will be offered to you as your favourite + game client. If a GGZ core client is installed, you can try + out GGZ by visiting the community site. + +@@ -197,7 +198,7 @@ + + Remember that when playing online, the opponent might be either a + human player or a computer player. The latter one might behave +-differently from the computer player included in &kbattleship;. ++differently from the computer player included in &kappname;. + + + +@@ -314,7 +315,7 @@ + + + +-Exit &kbattleship; ++Exit &kappname; + + + +@@ -394,7 +395,7 @@ + + + +-Configure the keyboard shortcuts used by &kbattleship;. ++Configure the keyboard shortcuts used by &kappname;. + + + +@@ -408,7 +409,7 @@ + + + +-Configure the toolbars provided by &kbattleship;. ++Configure the toolbars provided by &kappname;. + + + +@@ -437,7 +438,7 @@ + + + +-No, there is no hint system in &kbattleship;. ++No, there is no hint system in &kappname;. + + + +@@ -474,7 +475,7 @@ + + Credits and Licenses + +-&kbattleship; Copyright 2000-2007 ++&kappname; Copyright 2000-2007 + + + Authors +diff -ur kdegames-4.2.95/doc/ktron/index.docbook kdegames-4.2.95-trademarks/doc/ktron/index.docbook +--- kdegames-4.2.95/doc/ktron/index.docbook 2009-02-26 10:11:14.000000000 +0100 ++++ kdegames-4.2.95-trademarks/doc/ktron/index.docbook 2009-07-04 18:29:58.000000000 +0200 +@@ -1,6 +1,6 @@ + + ++ KSnakeDuel"> + + + +@@ -61,7 +61,7 @@ + + + +-&kappname; is a simple Tron clone for &kde;, which you can ++&kappname; is a simple snake duel game for &kde;, which you can + play alone or against a friend. + + +@@ -69,11 +69,12 @@ + + KDE + kdegames +-KTron ++KSnakeDuel + game +-tron ++snakeduel + KSnake + snake ++duel + + + +@@ -81,7 +82,7 @@ + Introduction + + +-&kappname; is a simple Tron-Clone for the ++&kappname; is a simple snake duel game for the + K Desktop Environment. You can play + &kappname; against the computer or a friend. + The aim of the game is to live longer than your opponent. To do that, +diff -ur kdegames-4.2.95/kbattleship/src/kbattleship.desktop kdegames-4.2.95-trademarks/kbattleship/src/kbattleship.desktop +--- kdegames-4.2.95/kbattleship/src/kbattleship.desktop 2009-06-17 22:05:45.000000000 +0200 ++++ kdegames-4.2.95-trademarks/kbattleship/src/kbattleship.desktop 2009-07-04 18:51:55.000000000 +0200 +@@ -1,6 +1,5 @@ + [Desktop Entry] +-Name=KBattleship +-Name[af]=Kbattleship ++Name=KSinkShips + Name[be]=Марскі бой + Name[bn]=কে-ব্যাটেলশীপ + Name[cs]=Lodě +@@ -14,17 +13,16 @@ + Name[ro]=Bătălie navală + Name[sr]=К‑подморнице + Name[sr@latin]=K‑podmornice +-Name[sv]=Kbattleship + Name[ta]=கேபாட்டில்ஷிப் + Name[tg]=KҶанги Киштиҳо + Name[uk]=Морський бій +-Name[x-test]=xxKBattleshipxx +-Name[zh_TW]=KBattleship 戰艦 ++Name[x-test]=xxKSinkShipsxx ++Name[zh_TW]=KSinkShips 戰艦 + Exec=kbattleship -caption "%c" + Icon=kbattleship + Type=Application + X-DocPath=kbattleship/index.html +-GenericName=Battleship Game ++GenericName=Ship Sinking Game + GenericName[be]=Гульня ў марскі бой + GenericName[bn]=ব্যাটেলশীপ খেলা + GenericName[ca]=Joc d'enfonsar la flota +@@ -32,7 +30,6 @@ + GenericName[cy]=Gêm Longau Rhyfel + GenericName[da]=Sænke slagskibe-spil + GenericName[de]=Schiffe versenken +-GenericName[el]=Παιχνίδι Battleship + GenericName[eo]=Batalŝipa ludo + GenericName[es]=Juego de la batalla de naves + GenericName[et]=Laevade pommitamise mäng +@@ -40,7 +37,6 @@ + GenericName[fa]=بازی جنگ کشتی‌ها + GenericName[fi]=Meritaistelupeli + GenericName[fr]=Jeu de bataille navale +-GenericName[ga]=Cluiche cosúil le "Battleship" + GenericName[gl]=Xogo de batalla naval + GenericName[he]=משחק צוללות + GenericName[hne]=बेटलसिप खेल +@@ -73,7 +69,7 @@ + GenericName[ta]=போர்த்தள விளையாட்டு + GenericName[tr]=Amiral Battı Oyunu + GenericName[uk]=Гра в морський бій +-GenericName[x-test]=xxBattleship Gamexx ++GenericName[x-test]=xxShip Sinking Gamexx + GenericName[zh_CN]=舰艇对战游戏 + GenericName[zh_TW]=戰艦遊戲 + Terminal=false +diff -ur kdegames-4.2.95/kbattleship/src/kbattleship.protocol kdegames-4.2.95-trademarks/kbattleship/src/kbattleship.protocol +--- kdegames-4.2.95/kbattleship/src/kbattleship.protocol 2009-06-23 13:13:36.000000000 +0200 ++++ kdegames-4.2.95-trademarks/kbattleship/src/kbattleship.protocol 2009-07-04 18:54:07.000000000 +0200 +@@ -5,27 +5,27 @@ + output=none + + Icon=kbattleship +-Description=A protocol for the game KBattleship +-Description[ca]=Un protocol pel joc KBattleship +-Description[da]=En protokol for spillet KBattleship +-Description[de]=Ein Protokoll für das KBattleship-Spiel. +-Description[el]=Ένα πρωτόκολλο για το παιχνίδι KBattleship +-Description[es]=Un protocolo para el juego KBattleship +-Description[et]=KBattleshipi protokoll +-Description[ga]=Prótacal le haghaidh an chluiche KBattleship +-Description[gl]=Un protocolo para o xogo KBattleship +-Description[it]=Un protocollo per KBattleship +-Description[nds]=En Protokoll för dat Speel "KBattleship" +-Description[nn]=Protokoll for KBattleship +-Description[pt]=Um protocolo para o jogo KBattleship +-Description[pt_BR]=Um protocolo para o jogo KBattleship ++Description=A protocol for the game KSinkShips ++Description[ca]=Un protocol pel joc KSinkShips ++Description[da]=En protokol for spillet KSinkShips ++Description[de]=Ein Protokoll für das KSinkShips-Spiel. ++Description[el]=Ένα πρωτόκολλο για το παιχνίδι KSinkShips ++Description[es]=Un protocolo para el juego KSinkShips ++Description[et]=KSinkShipsi protokoll ++Description[ga]=Prótacal le haghaidh an chluiche KSinkShips ++Description[gl]=Un protocolo para o xogo KSinkShips ++Description[it]=Un protocollo per KSinkShips ++Description[nds]=En Protokoll för dat Speel "KSinkShips" ++Description[nn]=Protokoll for KSinkShips ++Description[pt]=Um protocolo para o jogo KSinkShips ++Description[pt_BR]=Um protocolo para o jogo KSinkShips + Description[sr]=Протокол за К‑подморнице + Description[sr@latin]=Protokol za K‑podmornice + Description[sv]=Ett protokoll för spelet Sänka fartyg +-Description[uk]=Протокол для гри KBattleship +-Description[x-test]=xxA protocol for the game KBattleshipxx +-Description[zh_CN]=KBattleship 的游戏用协议 +-Description[zh_TW]=KBattleship 遊戲使用的協定 ++Description[uk]=Протокол для гри KSinkShips ++Description[x-test]=xxA protocol for the game KSinkShipsxx ++Description[zh_CN]=KSinkShips 的游戏用协议 ++Description[zh_TW]=KSinkShips 遊戲使用的協定 + #exec=kbattleship %u + + helper=true +diff -ur kdegames-4.2.95/kbattleship/src/main.cpp kdegames-4.2.95-trademarks/kbattleship/src/main.cpp +--- kdegames-4.2.95/kbattleship/src/main.cpp 2009-03-18 10:57:42.000000000 +0100 ++++ kdegames-4.2.95-trademarks/kbattleship/src/main.cpp 2009-07-04 18:54:51.000000000 +0200 +@@ -21,7 +21,7 @@ + + int main(int argc, char** argv) + { +- KAboutData aboutData("kbattleship", 0, ki18n("KBattleship"), "2.0", ++ KAboutData aboutData("kbattleship", 0, ki18n("KSinkShips"), "2.0", + ki18n("The KDE Battleship clone"), KAboutData::License_GPL, + ki18n("(c) 2000-2005 Nikolas Zimmermann, Daniel Molkentin\n" + "(c) 2007 Paolo Capriotti"), KLocalizedString(), "http://games.kde.org/kbattleship" ); +@@ -48,7 +48,7 @@ + KCmdLineArgs::init(argc, argv, &aboutData); + + KCmdLineOptions options; +- options.add("!+[URL]", ki18n("URL of a KBattleship game server to connect to after startup")); ++ options.add("!+[URL]", ki18n("URL of a KSinkShips game server to connect to after startup")); + KCmdLineArgs::addCmdLineOptions( options ); // Add our own options. + KApplication app; + +diff -ur kdegames-4.2.95/ktron/ktron.desktop kdegames-4.2.95-trademarks/ktron/ktron.desktop +--- kdegames-4.2.95/ktron/ktron.desktop 2009-06-24 18:19:36.000000000 +0200 ++++ kdegames-4.2.95-trademarks/ktron/ktron.desktop 2009-07-04 18:37:04.000000000 +0200 +@@ -3,38 +3,14 @@ + Exec=ktron -caption "%c" %i + Icon=ktron + DocPath=ktron/index.html +-GenericName=Tron-like Game +-GenericName[ca]=Joc similar al Tron +-GenericName[da]=Tron-lignende spil +-GenericName[de]=„Tron“-Spiel +-GenericName[el]=Παιχνίδι παρόμοιο με το Tron +-GenericName[et]=Troni moodi mäng +-GenericName[ga]=Cluiche Cosúil le Tron +-GenericName[it]=Un gioco simile a Tron +-GenericName[ja]=Tron のようなゲーム +-GenericName[nds]=Tron-liek Speel +-GenericName[nl]=Tron-achtig spel +-GenericName[nn]=Tron-liknande spel +-GenericName[pt]=Jogo Semelhante ao Tron +-GenericName[pt_BR]=Jogo Semelhante ao Tron +-GenericName[sr]=Игра налик на трон +-GenericName[sr@latin]=Igra nalik na tron +-GenericName[sv]=Tron-liknande spel +-GenericName[uk]=Гра, схожа на Tron +-GenericName[x-test]=xxTron-like Gamexx +-GenericName[zh_CN]=类似 Tron 的游戏 +-GenericName[zh_TW]=類似 Tron 遊戲 ++GenericName=Snake Duel Game ++GenericName[de]=Schlangenduell-Spiel ++GenericName[fr]=Jeu de duel de serpents ++GenericName[it]=Gioco di duello di serpenti ++GenericName[x-test]=xxSnake Duel Gamexx + Terminal=false +-Name=KTron +-Name[af]=Ktron +-Name[bn]=কে-ট্রন +-Name[ru]=Трон +-Name[sr]=К‑трон +-Name[sr@latin]=K‑tron +-Name[sv]=Ktron +-Name[ta]=Kட்ரான் +-Name[tg]=KТрон +-Name[x-test]=xxKTronxx ++Name=KSnakeDuel ++Name[x-test]=xxKSnakeDuelxx + X-KDE-StartupNotify=true + X-DCOP-ServiceType=Multi + Categories=Qt;KDE;Game;ArcadeGame; +diff -ur kdegames-4.2.95/ktron/main.cpp kdegames-4.2.95-trademarks/ktron/main.cpp +--- kdegames-4.2.95/ktron/main.cpp 2009-02-26 10:11:10.000000000 +0100 ++++ kdegames-4.2.95-trademarks/ktron/main.cpp 2009-07-04 18:41:11.000000000 +0200 +@@ -41,7 +41,7 @@ + + int main(int argc, char* argv[]) + { +- KAboutData aboutData( "ktron", 0, ki18n("KTron"), ++ KAboutData aboutData( "ktron", 0, ki18n("KSnakeDuel"), + KTRON_VERSION, description, KAboutData::License_GPL, notice); + aboutData.addAuthor(ki18n("Matthias Kiefer"), ki18n("Original author"), "matthias.kiefer@gmx.de"); + aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron@meyerhome.net"); +@@ -50,7 +50,8 @@ + KCmdLineArgs::init( argc, argv, &aboutData ); + + KCmdLineOptions options; +- options.add("ktron", ki18n("Start in KTron mode")); ++ // This is the default anyway, why does this need an option? -- Kevin Kofler ++ // options.add("ktron", ki18n("Start in KTron mode")); + options.add("snake", ki18n("Start in KSnake mode")); + KCmdLineArgs::addCmdLineOptions(options); + +diff -ur kdegames-4.2.95/ktron/player.cpp kdegames-4.2.95-trademarks/ktron/player.cpp +--- kdegames-4.2.95/ktron/player.cpp 2009-04-05 21:59:49.000000000 +0200 ++++ kdegames-4.2.95-trademarks/ktron/player.cpp 2009-07-04 18:33:45.000000000 +0200 +@@ -92,7 +92,7 @@ + { + if (isComputer()) + { +- return i18n("KTron"); ++ return i18n("KSnakeDuel"); + } + else + { +diff -ur kdegames-4.2.95/README kdegames-4.2.95-trademarks/README +--- kdegames-4.2.95/README 2009-01-16 16:09:32.000000000 +0100 ++++ kdegames-4.2.95-trademarks/README 2009-07-04 18:58:22.000000000 +0200 +@@ -25,9 +25,6 @@ + Play backgammon against a local human player, via a game server or + against GNU Backgammon (not included) + +-* kbattleship +- Sink battleship of your opponents, with built-in game server. +- + * kblackbox + Find the balls hidden in the black box by shooting laser beams! + +@@ -70,6 +67,15 @@ + * kshisen + Patience game where you take away all pieces. + ++* ksinkships ++ Sink ships of your opponents, with built-in game server. ++ ++* ksnake ++ Don't bite yourself, eat apples! ++ ++* ksnakeduel ++ Like ksnake, but without fruits. ++ + * kspaceduel + Two player game with shooting spaceships flying around a sun. + diff --git a/kdegames.spec b/kdegames.spec index 90625cc..a22fa6c 100644 --- a/kdegames.spec +++ b/kdegames.spec @@ -1,16 +1,14 @@ -%define trademark_issue 1 - Name: kdegames Summary: K Desktop Environment 4 - Games Epoch: 6 Version: 4.2.95 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 URL: http://www.kde.org/ Group: Amusements/Games Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegames-%{version}.tar.bz2 -Patch0: kdegames-4.2.95-kbattleship-ktron.patch +Patch0: kdegames-4.2.95-trademarks.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,7 +40,6 @@ Games for the K Desktop Environment 4, including: * bovo * kapman * katomic -* kbattleship * kblackbox * kblocks * kbounce @@ -64,7 +61,9 @@ Games for the K Desktop Environment 4, including: * kreversi * ksame * kshisen +* ksinkships * ksirk +* ksnakeduel / ksnake * kspaceduel * ksquares * ksudoku @@ -92,10 +91,7 @@ game applications for KDE 4. %prep %setup -q -n kdegames-%{version} - -%if %{trademark_issue} -%patch0 -p1 -b .trademark_issue -%endif +%patch0 -p1 -b .trademarks %build @@ -113,9 +109,7 @@ rm -rf %{buildroot} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %if 0%{?_skip_ggzconfig:1} -%if !%{trademark_issue} install -m644 -p -D ./kbattleship/src/module.dsc %{buildroot}%{_ggz_datadir}/kbattleship.dsc -%endif install -m644 -p -D ./kreversi/module.dsc %{buildroot}%{_ggz_datadir}/kreversi.dsc install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquares.dsc %endif @@ -123,9 +117,7 @@ install -m644 -p -D ./ksquares/src/module.dsc %{buildroot}%{_ggz_datadir}/ksquar %post %if 0%{?_skip_ggzconfig:1} -%if !%{trademark_issue} %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kbattleship.dsc ||: -%endif %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/kreversi.dsc ||: %{_ggz_config} --install --force --modfile=%{_ggz_datadir}/ksquares.dsc ||: %endif @@ -153,9 +145,7 @@ fi %if 0%{?_skip_ggzconfig:1} %preun if [ $1 -eq 0 ]; then -%if !%{trademark_issue} %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kbattleship.dsc ||: -%endif %{_ggz_config} --remove --modfile=%{_ggz_datadir}/kreversi.dsc ||: %{_ggz_config} --remove --modfile=%{_ggz_datadir}/ksquares.dsc ||: fi @@ -206,6 +196,9 @@ rm -rf %{buildroot} %changelog +* Sat Jul 04 2009 Kevin Kofler - 4.2.95-2 +- reenable and rebrand the ship sinking game and the snake duel game (#502359) + * Fri Jun 26 2009 Than Ngo - 4.2.95-1 - 4.3rc1