rpms/kdegames/devel kdegames.spec,1.145,1.146

[Than Ngo]

Author: than

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

Modified Files:
	kdegames.spec 
Log Message:
- drop ktron/kbattleship in RHEL



Index: kdegames.spec
===================================================================
RCS file: /cvs/extras/rpms/kdegames/devel/kdegames.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- kdegames.spec	10 Sep 2009 13:56:08 -0000	1.145
+++ kdegames.spec	10 Sep 2009 14:38:48 -0000	1.146
@@ -3,7 +3,7 @@ Name:    kdegames
 Summary: K Desktop Environment 4 - Games
 Epoch:   6
 Version: 4.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -66,9 +66,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 +100,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 +123,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 +139,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 +169,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 +197,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 +223,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* 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