rpms/kdegames/devel kdegames-4.2.95-kbattleship-ktron.patch, NONE, 1.1 kdegames.spec, 1.131, 1.132

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdegames/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23433

Modified Files:
	kdegames.spec 
Added Files:
	kdegames-4.2.95-kbattleship-ktron.patch 
Log Message:
disable ktron/kbattleship in the meantime because of trademark issues
we will enable it again when we have the patch


kdegames-4.2.95-kbattleship-ktron.patch:

--- NEW FILE kdegames-4.2.95-kbattleship-ktron.patch ---
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)


Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- kdegames.spec	26 Jun 2009 12:11:24 -0000	1.131
+++ kdegames.spec	30 Jun 2009 11:35:07 -0000	1.132
@@ -1,3 +1,5 @@
+%define trademark_issue 1
+
 Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
@@ -8,6 +10,8 @@ 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
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: kdegames4 < %{version}-%{release}
@@ -89,6 +93,9 @@ game applications for KDE 4.
 %prep
 %setup -q -n kdegames-%{version}
 
+%if %{trademark_issue}
+%patch0 -p1 -b .trademark_issue
+%endif
 
 %build
 
@@ -106,7 +113,9 @@ 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
@@ -114,7 +123,9 @@ install -m644 -p -D ./ksquares/src/modul
 
 %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
@@ -142,7 +153,9 @@ 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