rpms/kdegames/F-10 kdegames-4.3.1-trademarks.patch, NONE, 1.1 kdegames.spec, 1.120, 1.121 kdegames-4.3.0-trademarks.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdegames/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2231

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.3.1-trademarks.patch 
Removed Files:
	kdegames-4.3.0-trademarks.patch 
Log Message:
* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- adjust trademarks patch to include ktron.desktop


kdegames-4.3.1-trademarks.patch:
 README                               |   12 ++++++--
 doc/kbattleship/index.docbook        |   37 +++++++++++++------------
 doc/ktron/index.docbook              |   11 ++++---
 kbattleship/src/kbattleship.desktop  |   14 +++------
 kbattleship/src/kbattleship.protocol |   50 +++++++++++++++++------------------
 kbattleship/src/main.cpp             |    4 +-
 ktron/ktron.desktop                  |   12 ++++----
 ktron/main.cpp                       |    5 ++-
 ktron/player.cpp                     |    2 -
 9 files changed, 76 insertions(+), 71 deletions(-)

--- NEW FILE kdegames-4.3.1-trademarks.patch ---
diff -up kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks kdegames-4.3.1/doc/kbattleship/index.docbook
--- kdegames-4.3.1/doc/kbattleship/index.docbook.trademarks	2009-02-26 03:11:22.000000000 -0600
+++ kdegames-4.3.1/doc/kbattleship/index.docbook	2009-09-10 08:37:49.503073182 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&kbattleship;">
+  <!ENTITY kappname "<application>KSinkShips</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
@@ -8,7 +8,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &kbattleship; Handbook</title>
+<title>The &kappname; Handbook</title>
 
 <authorgroup>
 <author>
@@ -57,16 +57,17 @@
 
 <abstract>
 <para>
-&kbattleship; is a network-enabled implementation of the famous <quote>Battle Ship</quote> game for &kde;.</para>
+&kappname; is a network-enabled implementation of the famous ship sinking game for &kde;.</para>
 </abstract>
 
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>kbattleship</keyword>
+<keyword>ksinkships</keyword>
 <keyword>game</keyword>
-<keyword>battleship</keyword>
-<keyword>battle</keyword>
+<keyword>sinkships</keyword>
+<keyword>sink</keyword>
+<keyword>ships</keyword>
 </keywordset>
 
 </bookinfo>
@@ -76,7 +77,7 @@
 <note><title>Gametype:</title><para>Strategy, Board</para></note><!-- Game genre. Use as many as necessary. Available game types are: Arcade, Board, Card, Dice, Toys, Logic, Strategy.-->
 <note><title>Number of possible players:</title><para>Two</para></note><!--Number of possible players. It can be: One, Two,..., Multiplayer-->
 <para>
-&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.
 </para>
 </chapter>
@@ -85,14 +86,14 @@ ships in turns without knowing where the
 <title>How to Play</title>
 <note><title>Objective:</title><para>Sink all of the opponent’s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.-->
 <para>
-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 <guibutton>Single player</guibutton> on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu></menuchoice> menu.</para>
 
 <para>
 To start a network game, one player has to host the game by selecting <guilabel>Host network game</guilabel> on the welcome screen, or choosing <menuchoice><guimenu>Game</guimenu>
 <guimenuitem>Host Game...</guimenuitem></menuchoice>.
 A dialog box opens which asks for a <guilabel>Nickname:</guilabel> and <guilabel>Port:</guilabel>. 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.
 </para>
@@ -186,10 +187,10 @@ The first player to destroy all their op
 <title>Multiplayer support</title>
 
 <para>
-&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 <ulink url="ggz://live.ggzgamingzone.org/#Battleship">community site</ulink>.
 </para>
@@ -197,7 +198,7 @@ out GGZ by visiting the <ulink url="ggz:
 <para>
 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;.
 </para>
 
 </sect1>
@@ -314,7 +315,7 @@ differently from the computer player inc
 </term>
 <listitem>
 <para>
-<action>Exit</action> &kbattleship;
+<action>Exit</action> &kappname;
 </para>
 </listitem>
 </varlistentry>
@@ -394,7 +395,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure the keyboard shortcuts used by &kbattleship;.</action>
+<action>Configure the keyboard shortcuts used by &kappname;.</action>
 </para>
 </listitem>
 </varlistentry>
@@ -408,7 +409,7 @@ default is on.
 </term>
 <listitem>
 <para>
-<action>Configure</action> the toolbars provided by &kbattleship;.
+<action>Configure</action> the toolbars provided by &kappname;.
 </para>
 </listitem>
 </varlistentry>
@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
 </question>
 <answer>
 <para>
-No, there is no hint system in &kbattleship;.
+No, there is no hint system in &kappname;.
 </para>
 </answer>
 </qandaentry>
@@ -474,7 +475,7 @@ No, the theme is not changeable.
 <chapter id="credits">
 <title>Credits and Licenses</title>
 
-<para>&kbattleship; Copyright 2000-2007</para>
+<para>&kappname; Copyright 2000-2007</para>
 
 <itemizedlist>
 <title>Authors</title>
diff -up kdegames-4.3.1/doc/ktron/index.docbook.trademarks kdegames-4.3.1/doc/ktron/index.docbook
--- kdegames-4.3.1/doc/ktron/index.docbook.trademarks	2009-02-26 03:11:14.000000000 -0600
+++ kdegames-4.3.1/doc/ktron/index.docbook	2009-09-10 08:37:49.514322450 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY kappname "&ktron;">
+  <!ENTITY kappname "<application>KSnakeDuel</application>">
   <!ENTITY package "kdegames">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE">
@@ -61,7 +61,7 @@
 
 <abstract>
 <para>
-&kappname; is a simple <quote>Tron</quote> clone for &kde;, which you can
+&kappname; is a simple snake duel game for &kde;, which you can
 play alone or against a friend.
 </para>
 </abstract>
@@ -69,11 +69,12 @@ play alone or against a friend.
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>kdegames</keyword>
-<keyword>KTron</keyword>
+<keyword>KSnakeDuel</keyword>
 <keyword>game</keyword>
-<keyword>tron</keyword>
+<keyword>snakeduel</keyword>
 <keyword>KSnake</keyword>
 <keyword>snake</keyword>
+<keyword>duel</keyword>
 </keywordset>
 </bookinfo>
 
@@ -81,7 +82,7 @@ play alone or against a friend.
 <title>Introduction</title>
 
 <para>
-&kappname; is a simple Tron-Clone for the
+&kappname; is a simple snake duel game for the
 <ulink url="http://www.kde.org">K Desktop Environment</ulink>. 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 -up kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.desktop
--- kdegames-4.3.1/kbattleship/src/kbattleship.desktop.trademarks	2009-07-21 10:20:37.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/kbattleship.desktop	2009-09-10 08:37:49.518088014 -0500
@@ -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[pa]=ਕੇ-ਜੰਗੀ ਜਹਾà¨
 Name[ro]=Bătălie navală
 Name[sr]=К‑подморнице
 Name[sr at 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[cs]=Bitva lodí
 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[eu]=Ontzi-guda jokoa
 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]=बेटलसिप खेल
@@ -74,7 +70,7 @@ GenericName[ta]=போர்த்தள
 GenericName[tr]=Amiral Battı Oyunu
 GenericName[uk]=Гра в морський бій
 GenericName[wa]=Djeu di batreye di bateas
-GenericName[x-test]=xxBattleship Gamexx
+GenericName[x-test]=xxShip Sinking Gamexx
 GenericName[zh_CN]=舰艇对战游戏
 GenericName[zh_TW]=戰艦遊戲
 Terminal=false
diff -up kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks kdegames-4.3.1/kbattleship/src/kbattleship.protocol
--- kdegames-4.3.1/kbattleship/src/kbattleship.protocol.trademarks	2009-07-29 06:11:24.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/kbattleship.protocol	2009-09-10 08:37:49.519074173 -0500
@@ -5,34 +5,34 @@ input=none
 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[eu]=KBattleship jokoaren protokoloa
-Description[fr]=Un protocole pour le jeu KBattleship
-Description[ga]=Prótacal le haghaidh an chluiche KBattleship
-Description[gl]=Un protocolo para o xogo KBattleship
-Description[it]=Un protocollo per KBattleship
-Description[km]=ពិធីការ​សម្រាប់​ល្បែង KBattleship
-Description[lv]=Protokols spēlei KBattleship
-Description[nds]=En Protokoll för dat Speel "KBattleship"
-Description[nl]=Een protocol voor het spel KBattleship
-Description[nn]=Protokoll for KBattleship
-Description[pt]=Um protocolo para o jogo KBattleship
-Description[pt_BR]=Um protocolo para o jogo KBattleship
-Description[ru]=Протокол для игры KBattleship
-Description[sl]=Protokol za igro 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[eu]=KSinkShips jokoaren protokoloa
+Description[fr]=Un protocole pour le jeu KSinkShips
+Description[ga]=Prótacal le haghaidh an chluiche KSinkShips
+Description[gl]=Un protocolo para o xogo KSinkShips
+Description[it]=Un protocollo per KSinkShips
+Description[km]=ពិធីការ​សម្រាប់​ល្បែង KSinkShips
+Description[lv]=Protokols spēlei KSinkShips
+Description[nds]=En Protokoll för dat Speel "KSinkShips"
+Description[nl]=Een protocol voor het spel KSinkShips
+Description[nn]=Protokoll for KSinkShips
+Description[pt]=Um protocolo para o jogo KSinkShips
+Description[pt_BR]=Um protocolo para o jogo KSinkShips
+Description[ru]=Протокол для игры KSinkShips
+Description[sl]=Protokol za igro KSinkShips
 Description[sr]=Протокол за К‑подморнице
 Description[sr at 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 -up kdegames-4.3.1/kbattleship/src/main.cpp.trademarks kdegames-4.3.1/kbattleship/src/main.cpp
--- kdegames-4.3.1/kbattleship/src/main.cpp.trademarks	2009-08-27 03:16:58.000000000 -0500
+++ kdegames-4.3.1/kbattleship/src/main.cpp	2009-09-10 08:37:49.520074161 -0500
@@ -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 @@ int main(int argc, char** argv)
     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;
     KGlobal::locale()->insertCatalog("libkdegames");
diff -up kdegames-4.3.1/ktron/ktron.desktop.trademarks kdegames-4.3.1/ktron/ktron.desktop
--- kdegames-4.3.1/ktron/ktron.desktop.trademarks	2009-07-29 06:11:19.000000000 -0500
+++ kdegames-4.3.1/ktron/ktron.desktop	2009-09-10 08:46:38.445074891 -0500
@@ -3,7 +3,7 @@ Type=Application
 Exec=ktron -caption "%c" %i
 Icon=ktron
 DocPath=ktron/index.html
-GenericName=Tron-like Game
+GenericName=Snake Duel Game
 GenericName[ca]=Joc similar al Tron
 GenericName[cs]=Hra typu Tron
 GenericName[da]=Tron-lignende spil
@@ -29,20 +29,20 @@ GenericName[sr]=Игра налик на
 GenericName[sr at latin]=Igra nalik na tron
 GenericName[sv]=Tron-liknande spel
 GenericName[uk]=Гра, схожа на Tron
-GenericName[x-test]=xxTron-like Gamexx
+GenericName[x-test]=xxSnake Duel Gamexx
 GenericName[zh_CN]=类似 Tron 的游戏
 GenericName[zh_TW]=類似 Tron 遊戲
 Terminal=false
-Name=KTron
-Name[af]=Ktron
+Name=KSnakeDuel
+Name[af]=KSnakeDuel
 Name[bn]=কে-ট্রন
 Name[ru]=Трон
 Name[sr]=К‑трон
 Name[sr at latin]=K‑tron
-Name[sv]=Ktron
+Name[sv]=KsnakeDuel
 Name[ta]=Kட்ரான்
 Name[tg]=KТрон
-Name[x-test]=xxKTronxx
+Name[x-test]=xxKSnakeDuelxx
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;KDE;Game;ArcadeGame;
diff -up kdegames-4.3.1/ktron/main.cpp.trademarks kdegames-4.3.1/ktron/main.cpp
--- kdegames-4.3.1/ktron/main.cpp.trademarks	2009-02-26 03:11:10.000000000 -0600
+++ kdegames-4.3.1/ktron/main.cpp	2009-09-10 08:37:49.521074148 -0500
@@ -41,7 +41,7 @@ static KLocalizedString notice = ki18n("
 
 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 at gmx.de");
   aboutData.addAuthor(ki18n("Benjamin Meyer"), ki18n("Various improvements"), "ben+ktron at meyerhome.net");
@@ -50,7 +50,8 @@ int main(int argc, char* argv[])
   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 -up kdegames-4.3.1/ktron/player.cpp.trademarks kdegames-4.3.1/ktron/player.cpp
--- kdegames-4.3.1/ktron/player.cpp.trademarks	2009-04-05 14:59:49.000000000 -0500
+++ kdegames-4.3.1/ktron/player.cpp	2009-09-10 08:37:49.523074403 -0500
@@ -92,7 +92,7 @@ QString Player::getName()
 {
 	if (isComputer())
 	{
-		return i18n("KTron");
+		return i18n("KSnakeDuel");
 	}
 	else
 	{
diff -up kdegames-4.3.1/README.trademarks kdegames-4.3.1/README
--- kdegames-4.3.1/README.trademarks	2009-01-16 09:09:32.000000000 -0600
+++ kdegames-4.3.1/README	2009-09-10 08:37:49.529084945 -0500
@@ -25,9 +25,6 @@ This is a compilation of more than 20 va
     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 @@ This is a compilation of more than 20 va
 * 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.
 


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-10/kdegames.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- kdegames.spec	4 Sep 2009 17:00:37 -0000	1.120
+++ kdegames.spec	10 Sep 2009 14:30:31 -0000	1.121
@@ -1,15 +1,15 @@
-%define _default_patch_fuzz 2
+
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.1
-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.3.0-trademarks.patch
+Patch0:  kdegames-4.3.1-trademarks.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -98,8 +98,8 @@ game applications for KDE 4.
 %setup -q -n kdegames-%{version}
 %patch0 -p1 -b .trademarks
 
-%build
 
+%build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} %{?_skip_ggzconfig} ..
@@ -208,6 +208,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
+- adjust trademarks patch to include ktron.desktop
+
 * Fri Aug 28 2009 Than Ngo <than at redhat.com> - 4.3.1-1
 - 4.3.1
 


--- kdegames-4.3.0-trademarks.patch DELETED ---