rpms/kdegames/F-11 kdegames.spec,1.139,1.140

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kdegames.spec 
Log Message:
sync (one more time, with feeling) w/F-12 branch



Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-11/kdegames.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- kdegames.spec	26 Jan 2010 13:09:10 -0000	1.139
+++ kdegames.spec	26 Jan 2010 16:35:27 -0000	1.140
@@ -14,12 +14,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # 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
+# Name and GenericName (except we use "Ship Sinking Game" rather than
+# "SinkShips Game" in English (default, en_GB, x-test)).
+# In kbattleship.protocol, 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
-## FIXME/TODO, needs rebasing -- Rex
-Patch0: kdegames-4.3.3-trademarks.patch
+Patch0: kdegames-4.3.5-trademarks.patch
 
 # KSnakeDuel moved here from kdegames3
 Conflicts: kdegames3 < 3.5.10-6