rpms/kdegames/F-12 kdegames-4.3.98-trademarks.patch, 1.1, 1.2 kdegames.spec, 1.155, 1.156

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdegames-4.3.98-trademarks.patch kdegames.spec 
Log Message:
* Wed Feb 24 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.0-3
- fix snake graphics in KSnakeDuel: omit bad hunk from trademark patch (#568134)

kdegames-4.3.98-trademarks.patch:
 README                               |   12 +++-
 doc/kbattleship/index.docbook        |   37 ++++++-------
 doc/ktron/index.docbook              |   11 ++-
 kbattleship/src/kbattleship.desktop  |   98 +++++++++++++++++------------------
 kbattleship/src/kbattleship.protocol |   60 ++++++++++-----------
 kbattleship/src/main.cpp             |    6 +-
 kbattleship/src/message.cpp          |    2 
 kbattleship/src/playfield.cpp        |    2 
 ktron/general.ui                     |    4 -
 ktron/ktron.desktop                  |   97 ++--------------------------------
 ktron/main.cpp                       |    5 +
 ktron/player.cpp                     |    2 
 12 files changed, 131 insertions(+), 205 deletions(-)

Index: kdegames-4.3.98-trademarks.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-12/kdegames-4.3.98-trademarks.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdegames-4.3.98-trademarks.patch	10 Feb 2010 14:59:10 -0000	1.1
+++ kdegames-4.3.98-trademarks.patch	24 Feb 2010 21:16:00 -0000	1.2
@@ -610,23 +610,6 @@ diff -ur kdegames-4.3.98/ktron/player.cp
  	}
  	else
  	{
-diff -ur kdegames-4.3.98/ktron/snakepart.cpp kdegames-4.3.98-trademarks/ktron/snakepart.cpp
---- kdegames-4.3.98/ktron/snakepart.cpp	2009-04-05 21:59:49.000000000 +0200
-+++ kdegames-4.3.98-trademarks/ktron/snakepart.cpp	2010-02-01 05:58:52.000000000 +0100
-@@ -120,11 +120,11 @@
- 	// Player
- 	if (getPlayerNumber() == 0)
- 	{
--		name = "tron1-";
-+		name = "snake1-";
- 	}
- 	else if (getPlayerNumber() == 1)
- 	{
--		name = "tron2-";
-+		name = "snake2-";
- 	}
- 
- 	// Heads (or tails)
 diff -ur kdegames-4.3.98/README kdegames-4.3.98-trademarks/README
 --- kdegames-4.3.98/README	2009-11-02 13:00:47.000000000 +0100
 +++ kdegames-4.3.98-trademarks/README	2010-02-01 05:58:52.000000000 +0100


Index: kdegames.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegames/F-12/kdegames.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -p -r1.155 -r1.156
--- kdegames.spec	13 Feb 2010 12:22:18 -0000	1.155
+++ kdegames.spec	24 Feb 2010 21:16:00 -0000	1.156
@@ -3,7 +3,7 @@ Name:    kdegames
 Summary: KDE Games
 Epoch:   6
 Version: 4.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -332,6 +332,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Feb 24 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.0-3
+- fix snake graphics in KSnakeDuel: omit bad hunk from trademark patch (#568134)
+
 * Sat Feb 13 2010 Rex Dieter <rdieter at fedoraproject.org> - 6:4.4.0-2
 - Requires: gnugo (#564496)