[kdegames] - 4.5.80 (4.6beta1)

[Rex Dieter]

commit e916f15de688f3ee824971c1a88937c0d689b94b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Nov 21 17:02:04 2010 -0600

    - 4.5.80 (4.6beta1)

 .gitignore                      |    3 +-
 kdegames-4.5.3-trademarks.patch |  964 ---------------------------------------
 kdegames.spec                   |   42 +--
 sources                         |    2 +-
 4 files changed, 9 insertions(+), 1002 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7918fb..9902c35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/kdegames-4.5.2.tar.bz2
-/kdegames-4.5.3.tar.bz2
+/kdegames-4.5.80.tar.bz2
diff --git a/kdegames.spec b/kdegames.spec
index 3d07599..e2f270c 100644
--- a/kdegames.spec
+++ b/kdegames.spec
@@ -2,8 +2,8 @@
 Name:    kdegames
 Summary: KDE Games
 Epoch:   6
-Version: 4.5.3
-Release: 3%{?dist}
+Version: 4.5.80
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -11,19 +11,7 @@ Group:   Amusements/Games
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdegames-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# 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
-Patch0: kdegames-4.5.3-trademarks.patch
-
-# upstream patches from 4.4 trunk
+## upstream patches
 
 # KSnakeDuel moved here from kdegames3
 Conflicts: kdegames3 < 3.5.10-6
@@ -91,10 +79,8 @@ Games for KDE 4, including:
 * ksame
 * kshisen
 * ksirk
-%if 0%{?fedora}
 * ksnakeduel / ksnake
-* ksinkships
-%endif
+* navel battle 
 * kspaceduel
 * ksquares
 * ksudoku
@@ -133,15 +119,6 @@ game applications for KDE 4.
 
 %prep
 %setup -q -n kdegames-%{version}%{?alphatag}
-%patch0 -p1 -b .trademarks
-
-# 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
 
 
 %build
@@ -159,9 +136,7 @@ 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
@@ -180,9 +155,7 @@ 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
@@ -220,9 +193,7 @@ 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
@@ -281,9 +252,7 @@ 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_datadir}/kde4/services/ServiceMenus/palapeli_servicemenu.desktop
 %{_kde4_datadir}/kde4/services/pala*.desktop
 %{_kde4_datadir}/kde4/servicetypes/libpala-slicerplugin.desktop
@@ -365,6 +334,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Nov 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.80-1
+- 4.5.80 (4.6beta1)
+
 * Tue Nov 09 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.3-3
 - require only python-twisted-core, not all of python-twisted
 - explicitly require qt4-sqlite
diff --git a/sources b/sources
index b798634..e2e2557 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df43122fa0d53c011ac1867144c7ba25  kdegames-4.5.3.tar.bz2
+58d19e18319664fb37d6727008c98699  kdegames-4.5.80.tar.bz2