rpms/kdegames/F-11 kdegames-4.3.1-trademarks.patch, 1.1, 1.2 kdegames.spec, 1.133, 1.134
Kevin Kofler
kkofler at fedoraproject.org
Sat Sep 12 17:47:21 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/kdegames/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23658/F-11
Modified Files:
kdegames-4.3.1-trademarks.patch kdegames.spec
Log Message:
Sync from devel:
* Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
- also fix ktron.desktop rebranding for non-US locales
* Thu Sep 10 2009 Than Ngo <than at redhat.com> - 4.3.1-3
- drop ktron/kbattleship in RHEL
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 | 46 ++++----------------------------
ktron/main.cpp | 5 ++-
ktron/player.cpp | 2 -
9 files changed, 77 insertions(+), 104 deletions(-)
Index: kdegames-4.3.1-trademarks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-11/kdegames-4.3.1-trademarks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdegames-4.3.1-trademarks.patch 10 Sep 2009 14:29:00 -0000 1.1
+++ kdegames-4.3.1-trademarks.patch 12 Sep 2009 17:47:20 -0000 1.2
@@ -1,6 +1,6 @@
-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
+diff -ur kdegames-4.3.1/doc/kbattleship/index.docbook kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook
+--- kdegames-4.3.1/doc/kbattleship/index.docbook 2009-02-26 10:11:22.000000000 +0100
++++ kdegames-4.3.1-trademarks/doc/kbattleship/index.docbook 2009-09-12 19:38:42.000000000 +0200
@@ -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" [
@@ -49,7 +49,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
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
+@@ -85,14 +86,14 @@
<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>
@@ -66,7 +66,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
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
+@@ -186,10 +187,10 @@
<title>Multiplayer support</title>
<para>
@@ -80,7 +80,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
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:
+@@ -197,7 +198,7 @@
<para>
Remember that when playing online, the opponent might be either a
human player or a computer player. The latter one might behave
@@ -89,7 +89,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
</para>
</sect1>
-@@ -314,7 +315,7 @@ differently from the computer player inc
+@@ -314,7 +315,7 @@
</term>
<listitem>
<para>
@@ -98,7 +98,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
</para>
</listitem>
</varlistentry>
-@@ -394,7 +395,7 @@ default is on.
+@@ -394,7 +395,7 @@
</term>
<listitem>
<para>
@@ -107,7 +107,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
</para>
</listitem>
</varlistentry>
-@@ -408,7 +409,7 @@ default is on.
+@@ -408,7 +409,7 @@
</term>
<listitem>
<para>
@@ -116,7 +116,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
</para>
</listitem>
</varlistentry>
-@@ -437,7 +438,7 @@ I'm not sure where to shoot, can I get a
+@@ -437,7 +438,7 @@
</question>
<answer>
<para>
@@ -125,7 +125,7 @@ diff -up kdegames-4.3.1/doc/kbattleship/
</para>
</answer>
</qandaentry>
-@@ -474,7 +475,7 @@ No, the theme is not changeable.
+@@ -474,7 +475,7 @@
<chapter id="credits">
<title>Credits and Licenses</title>
@@ -134,9 +134,9 @@ diff -up kdegames-4.3.1/doc/kbattleship/
<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
+diff -ur kdegames-4.3.1/doc/ktron/index.docbook kdegames-4.3.1-trademarks/doc/ktron/index.docbook
+--- kdegames-4.3.1/doc/ktron/index.docbook 2009-02-26 10:11:14.000000000 +0100
++++ kdegames-4.3.1-trademarks/doc/ktron/index.docbook 2009-09-12 19:38:42.000000000 +0200
@@ -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" [
@@ -154,7 +154,7 @@ diff -up kdegames-4.3.1/doc/ktron/index.
play alone or against a friend.
</para>
</abstract>
-@@ -69,11 +69,12 @@ play alone or against a friend.
+@@ -69,11 +69,12 @@
<keywordset>
<keyword>KDE</keyword>
<keyword>kdegames</keyword>
@@ -169,7 +169,7 @@ diff -up kdegames-4.3.1/doc/ktron/index.
</keywordset>
</bookinfo>
-@@ -81,7 +82,7 @@ play alone or against a friend.
+@@ -81,7 +82,7 @@
<title>Introduction</title>
<para>
@@ -178,9 +178,9 @@ diff -up kdegames-4.3.1/doc/ktron/index.
<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
+diff -ur kdegames-4.3.1/kbattleship/src/kbattleship.desktop kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.desktop
+--- kdegames-4.3.1/kbattleship/src/kbattleship.desktop 2009-07-21 17:20:37.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.desktop 2009-09-12 19:38:42.000000000 +0200
@@ -1,6 +1,5 @@
[Desktop Entry]
-Name=KBattleship
@@ -189,7 +189,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
Name[be]=ÐаÑÑÐºÑ Ð±Ð¾Ð¹
Name[bn]=à¦à§-বà§à¦¯à¦¾à¦à§à¦²à¦¶à§à¦ª
Name[cs]=LodÄ
-@@ -14,17 +13,16 @@ Name[pa]=à¨à©-à¨à©°à¨à© à¨à¨¹à¨¾à¨
+@@ -14,17 +13,16 @@
Name[ro]=BÄtÄlie navalÄ
Name[sr]=ÐâподмоÑниÑе
Name[sr at latin]=Kâpodmornice
@@ -210,7 +210,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
GenericName[be]=ÐÑлÑÐ½Ñ Ñ Ð¼Ð°ÑÑÐºÑ Ð±Ð¾Ð¹
GenericName[bn]=বà§à¦¯à¦¾à¦à§à¦²à¦¶à§à¦ª à¦à§à¦²à¦¾
GenericName[ca]=Joc d'enfonsar la flota
-@@ -32,7 +30,6 @@ GenericName[cs]=Bitva lodÃ
+@@ -32,7 +30,6 @@
GenericName[cy]=Gêm Longau Rhyfel
GenericName[da]=Sænke slagskibe-spil
GenericName[de]=Schiffe versenken
@@ -218,7 +218,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
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
+@@ -40,7 +37,6 @@
GenericName[fa]=Ø¨Ø§Ø²Û Ø¬ÙÚ¯ کشتÛâÙا
GenericName[fi]=Meritaistelupeli
GenericName[fr]=Jeu de bataille navale
@@ -226,7 +226,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
GenericName[gl]=Xogo de batalla naval
GenericName[he]=×ש×ק צ××××ת
GenericName[hne]=बà¥à¤à¤²à¤¸à¤¿à¤ª à¤à¥à¤²
-@@ -74,7 +70,7 @@ GenericName[ta]=பà¯à®°à¯à®¤à¯à®¤à®³
+@@ -74,7 +70,7 @@
GenericName[tr]=Amiral Battı Oyunu
GenericName[uk]=ÐÑа в моÑÑÑкий бÑй
GenericName[wa]=Djeu di batreye di bateas
@@ -235,10 +235,10 @@ diff -up kdegames-4.3.1/kbattleship/src/
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
+diff -ur kdegames-4.3.1/kbattleship/src/kbattleship.protocol kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.protocol
+--- kdegames-4.3.1/kbattleship/src/kbattleship.protocol 2009-07-29 13:11:24.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/kbattleship.protocol 2009-09-12 19:38:42.000000000 +0200
+@@ -5,34 +5,34 @@
output=none
Icon=kbattleship
@@ -298,9 +298,9 @@ diff -up kdegames-4.3.1/kbattleship/src/
#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
+diff -ur kdegames-4.3.1/kbattleship/src/main.cpp kdegames-4.3.1-trademarks/kbattleship/src/main.cpp
+--- kdegames-4.3.1/kbattleship/src/main.cpp 2009-08-27 10:16:58.000000000 +0200
++++ kdegames-4.3.1-trademarks/kbattleship/src/main.cpp 2009-09-12 19:38:42.000000000 +0200
@@ -21,7 +21,7 @@
int main(int argc, char** argv)
@@ -310,7 +310,7 @@ diff -up kdegames-4.3.1/kbattleship/src/
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)
+@@ -48,7 +48,7 @@
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineOptions options;
@@ -319,48 +319,67 @@ diff -up kdegames-4.3.1/kbattleship/src/
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
+diff -ur kdegames-4.3.1/ktron/ktron.desktop kdegames-4.3.1-trademarks/ktron/ktron.desktop
+--- kdegames-4.3.1/ktron/ktron.desktop 2009-07-29 13:11:19.000000000 +0200
++++ kdegames-4.3.1-trademarks/ktron/ktron.desktop 2009-09-12 19:41:54.000000000 +0200
+@@ -3,46 +3,14 @@
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[ca]=Joc similar al Tron
+-GenericName[cs]=Hra typu Tron
+-GenericName[da]=Tron-lignende spil
+-GenericName[de]=âTronâ-Spiel
+-GenericName[el]=ΠαιÏνίδι ÏαÏÏμοιο με Ïο Tron
+-GenericName[es]=Juego similar a Tron
+-GenericName[et]=Troni moodi mäng
+-GenericName[eu]=Tron-en antzeko jokoa
+-GenericName[fr]=Jeu dans le style de Tron
+-GenericName[ga]=Cluiche Cosúil le Tron
+-GenericName[it]=Un gioco simile a Tron
+-GenericName[ja]=Tron ã®ãããªã²ã¼ã
+-GenericName[km]=áááááâáá¼á
âáá¹á Tron
+-GenericName[lv]=Tron lÄ«dzÄ«ga spÄle
+-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[ru]=ÐгÑа в ÑÑиле «ТÑон»
+-GenericName[sl]=Igra podobna Tronu
+-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[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
- 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[bn]=à¦à§-à¦à§à¦°à¦¨
+-Name[ru]=ТÑон
+-Name[sr]=ÐâÑÑон
+-Name[sr at latin]=Kâtron
-Name[sv]=Ktron
-+Name[sv]=KsnakeDuel
- Name[ta]=Kà®à¯à®°à®¾à®©à¯
- Name[tg]=KТÑон
+-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 -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("
+diff -ur kdegames-4.3.1/ktron/main.cpp kdegames-4.3.1-trademarks/ktron/main.cpp
+--- kdegames-4.3.1/ktron/main.cpp 2009-02-26 10:11:10.000000000 +0100
++++ kdegames-4.3.1-trademarks/ktron/main.cpp 2009-09-12 19:38:42.000000000 +0200
+@@ -41,7 +41,7 @@
int main(int argc, char* argv[])
{
@@ -369,7 +388,7 @@ diff -up kdegames-4.3.1/ktron/main.cpp.t
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[])
+@@ -50,7 +50,8 @@
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineOptions options;
@@ -379,10 +398,10 @@ diff -up kdegames-4.3.1/ktron/main.cpp.t
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()
+diff -ur kdegames-4.3.1/ktron/player.cpp kdegames-4.3.1-trademarks/ktron/player.cpp
+--- kdegames-4.3.1/ktron/player.cpp 2009-04-05 21:59:49.000000000 +0200
++++ kdegames-4.3.1-trademarks/ktron/player.cpp 2009-09-12 19:38:42.000000000 +0200
+@@ -92,7 +92,7 @@
{
if (isComputer())
{
@@ -391,10 +410,10 @@ diff -up kdegames-4.3.1/ktron/player.cpp
}
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
+diff -ur kdegames-4.3.1/README kdegames-4.3.1-trademarks/README
+--- kdegames-4.3.1/README 2009-01-16 16:09:32.000000000 +0100
++++ kdegames-4.3.1-trademarks/README 2009-09-12 19:38:42.000000000 +0200
+@@ -25,9 +25,6 @@
Play backgammon against a local human player, via a game server or
against GNU Backgammon (not included)
@@ -404,7 +423,7 @@ diff -up kdegames-4.3.1/README.trademark
* 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
+@@ -70,6 +67,15 @@
* kshisen
Patience game where you take away all pieces.
Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-11/kdegames.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- kdegames.spec 10 Sep 2009 14:29:00 -0000 1.133
+++ kdegames.spec 12 Sep 2009 17:47:20 -0000 1.134
@@ -3,12 +3,19 @@ Name: kdegames
Summary: K Desktop Environment 4 - Games
Epoch: 6
Version: 4.3.1
-Release: 2%{?dist}
+Release: 4%{?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
+# Please be careful when rebasing this one! If you accidentally drop parts of
+# it, Legal is going to kick our ass. ;-)
+# In kbattleship.desktop, s/KBattleship/KSinkShips/ in all translations of
+# Description. (The other strings don't contain "battleship".)
+# In ktron.desktop, just remove all the translations containing "Tron" or
+# "KTron". Use my translations of GenericName for de, fr, it, feel free to add
+# more, but don't use "Tron" in them! -- Kevin
Patch0: kdegames-4.3.1-trademarks.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,9 +73,11 @@ Games for the K Desktop Environment 4, i
* kreversi
* ksame
* kshisen
-* ksinkships
* ksirk
+%if 0%{?fedora}
* ksnakeduel / ksnake
+* ksinkships
+%endif
* kspaceduel
* ksquares
* ksudoku
@@ -98,8 +107,15 @@ game applications for KDE 4.
%setup -q -n kdegames-%{version}
%patch0 -p1 -b .trademarks
-
%build
+# trademarks issue in RHEL
+%if 0%{?fedora} == 0
+sed -i -e "s,macro_optional_add_subdirectory(kbattleship),,g" CMakeLists.txt
+sed -i -e "s,macro_optional_add_subdirectory(ktron),,g" CMakeLists.txt
+sed -i -e "s,add_subdirectory(kbattleship),,g" doc/CMakeLists.txt
+sed -i -e "s,add_subdirectory(ktron),,g" doc/CMakeLists.txt
+%endif
+
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} %{?_skip_ggzconfig} ..
@@ -114,7 +130,9 @@ rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%if 0%{?_skip_ggzconfig:1}
+%if 0%{?fedora}
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
@@ -128,7 +146,9 @@ done
%post
%if 0%{?_skip_ggzconfig:1}
+%if 0%{?fedora}
%{_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
@@ -156,7 +176,9 @@ fi
%if 0%{?_skip_ggzconfig:1}
%preun
if [ $1 -eq 0 ]; then
+%if 0%{?fedora}
%{_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
@@ -182,15 +204,15 @@ rm -rf %{buildroot}
%{_kde4_datadir}/sounds/kapman/
%{_kde4_datadir}/applications/kde4/*
%{_kde4_datadir}/config.kcfg/*
+%if 0%{?fedora}
%{_kde4_datadir}/kde4/services/kbattleship.protocol
+%endif
%{_kde4_docdir}/HTML/en/*
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_iconsdir}/locolor/*/*/*
%{_kde4_iconsdir}/oxygen/*/*/*
%if 0%{?_skip_ggzconfig:1}
-%{_ggz_datadir}/kbattleship.dsc
-%{_ggz_datadir}/kreversi.dsc
-%{_ggz_datadir}/ksquares.dsc
+%{_ggz_datadir}/*.dsc
%else
%{_ggz_configdir}/ggz.modules.d/kdegames
%endif
@@ -208,6 +230,12 @@ rm -rf %{buildroot}
%changelog
+* Sat Sep 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.1-4
+- also fix ktron.desktop rebranding for non-US locales
+
+* Thu Sep 10 2009 Than Ngo <than at redhat.com> - 4.3.1-3
+- drop ktron/kbattleship in RHEL
+
* Thu Sep 10 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-2
- adjust trademarks patch to include ktron.desktop
More information about the fedora-extras-commits
mailing list