[kdegames] add rhel condition

Mon Apr 16 12:08:50 UTC 2012

commit e3103a4706b96c248986c00a933e65b487a325a6
Author: Than Ngo <than at redhat.com>
Date:   Mon Apr 16 14:08:34 2012 +0200

    add rhel condition

 kdegames-4.8.1-minimal.patch |   56 ++++++++++++++++++++++++++++++++++++++++
 kdegames.spec                |   58 ++++++++++++++++++-----------------------
 2 files changed, 82 insertions(+), 32 deletions(-)
---

diff --git a/kdegames-4.8.1-minimal.patch b/kdegames-4.8.1-minimal.patch
new file mode 100644
index 0000000..5763266
--- /dev/null
+++ b/kdegames-4.8.1-minimal.patch
@@ -0,0 +1,56 @@
+diff -up kdegames-4.8.2/CMakeLists.txt.rhel kdegames-4.8.2/CMakeLists.txt
+--- kdegames-4.8.2/CMakeLists.txt.rhel	2011-07-27 20:25:18.000000000 +0200
++++ kdegames-4.8.2/CMakeLists.txt	2012-04-10 18:18:21.753544477 +0200
+@@ -53,52 +53,9 @@ endif(WIN32)
+ add_subdirectory(libkdegames)
+ add_subdirectory(libkmahjongg)
+ 
+-macro_optional_add_subdirectory(bomber)
+-macro_optional_add_subdirectory(bovo)
+-if(OPENAL_FOUND)
+-    macro_optional_add_subdirectory(granatier)
+-endif(OPENAL_FOUND)
+-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)
+-macro_optional_add_subdirectory(kbreakout)
+-macro_optional_add_subdirectory(kdiamond)
+-macro_optional_add_subdirectory(kfourinline)
+-macro_optional_add_subdirectory(kgoldrunner)
+-macro_optional_add_subdirectory(killbots)
+-macro_optional_add_subdirectory(kigo)
+-macro_optional_add_subdirectory(kiriki)
+-macro_optional_add_subdirectory(kjumpingcube)
+-macro_optional_add_subdirectory(klickety)
+-macro_optional_add_subdirectory(klines)
+ macro_optional_add_subdirectory(kmahjongg)
+ macro_optional_add_subdirectory(kmines)
+-macro_optional_add_subdirectory(knetwalk)
+-macro_optional_add_subdirectory(kolf)
+-macro_optional_add_subdirectory(kollision)
+-macro_optional_add_subdirectory(konquest)
+ macro_optional_add_subdirectory(kpat)
+-macro_optional_add_subdirectory(kreversi)
+-macro_optional_add_subdirectory(kshisen)
+-if(QCA2_FOUND)
+-    macro_optional_add_subdirectory(ksirk)
+-endif(QCA2_FOUND)
+-macro_optional_add_subdirectory(kspaceduel)
+-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)
+-macro_optional_add_subdirectory(palapeli)
+-if(PYTHONINTERP_FOUND)
+-    macro_optional_add_subdirectory(kajongg)
+-endif(PYTHONINTERP_FOUND)
+ 
+ add_subdirectory(cmake)
+ macro_optional_add_subdirectory(doc)
diff --git a/kdegames.spec b/kdegames.spec
index 78df400..209fe5c 100644
--- a/kdegames.spec
+++ b/kdegames.spec
@@ -2,7 +2,7 @@ Name:    kdegames
 Summary: KDE Games
 Epoch:   6
 Version: 4.8.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -14,6 +14,8 @@ Group:   Amusements/Games
 %global stable stable
 %endif
 Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kdegames-%{version}.tar.xz
+Patch0: kdegames-4.8.1-minimal.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
@@ -31,17 +33,18 @@ Obsoletes: ksirk < %{version}-%{release}
 Provides:  ksirk = %{version}-%{release}
 
 BuildRequires: desktop-file-utils
-# mostly for /etc/rpm/macros.ggz
-BuildRequires: ggz-base-libs-devel
+
 BuildRequires: kdelibs4-devel >= %{version}
-# for Granatier/KGoldrunner
 %if 0%{?fedora}
+# mostly for /etc/rpm/macros.ggz
+BuildRequires: ggz-base-libs-devel
+# for Granatier/KGoldrunne
 BuildRequires: pkgconfig(openal)
-%endif
 BuildRequires: pkgconfig(sndfile)
 BuildRequires: pkgconfig(qca2)
 # for Kajongg
 BuildRequires: python
+%endif
 
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -65,9 +68,7 @@ Requires: vorbis-tools
 Games for KDE 4, including:
 * bomber
 * bovo
-%if 0%{?fedora}
 * granatier
-%endif
 * kajongg
 * kapman
 * katomic
@@ -77,9 +78,7 @@ Games for KDE 4, including:
 * kbreakout
 * kdiamond
 * kfourinline
-%if 0%{?fedora}
 * kgoldrunner
-%endif
 * kigo
 * killbots
 * kiriki
@@ -134,7 +133,9 @@ game applications for KDE 4.
 
 %prep
 %setup -q -n kdegames-%{version}%{?alphatag}
-
+%if 0%{?rhel}
+%patch0 -p1 -b .rhel
+%endif
 
 %build
 mkdir -p %{_target_platform}
@@ -212,7 +213,7 @@ fi
 %clean
 rm -rf %{buildroot}
 
-
+%if 0%{?fedora}
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS README
@@ -228,14 +229,6 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/applications/kde4/bovo.desktop
 %{_kde4_docdir}/HTML/en/bovo/
 %{_kde4_iconsdir}/hicolor/*/*/bovo.*
-%if 0%{?fedora}
-%{_kde4_appsdir}/granatier/
-%{_kde4_bindir}/granatier
-%{_kde4_datadir}/applications/kde4/granatier.desktop
-%{_kde4_datadir}/config.kcfg/granatier.kcfg
-%{_kde4_docdir}/HTML/en/granatier/
-%{_kde4_iconsdir}/hicolor/*/*/granatier.*
-%endif
 %{_kde4_appsdir}/kajongg/
 %{_kde4_bindir}/kajongg*
 %{_kde4_datadir}/applications/kde4/kajongg.desktop
@@ -296,21 +289,12 @@ rm -rf %{buildroot}
 %{_kde4_datadir}/config.kcfg/kwin4.kcfg
 %{_kde4_docdir}/HTML/en/kfourinline/
 %{_kde4_iconsdir}/hicolor/*/*/kfourinline.*
-%if 0%{?fedora}
 %{_kde4_appsdir}/kgoldrunner/
 %{_kde4_bindir}/kgoldrunner
 %{_kde4_configdir}/kgoldrunner.knsrc
 %{_kde4_datadir}/applications/kde4/KGoldrunner.desktop
 %{_kde4_docdir}/HTML/en/kgoldrunner/
 %{_kde4_iconsdir}/hicolor/*/*/kgoldrunner.*
-%else
-%exclude %{_kde4_appsdir}/kgoldrunner/
-%exclude %{_kde4_bindir}/kgoldrunner
-%exclude %{_kde4_configdir}/kgoldrunner.knsrc
-%exclude %{_kde4_datadir}/applications/kde4/KGoldrunner.desktop
-%exclude %{_kde4_docdir}/HTML/en/kgoldrunner/
-%exclude %{_kde4_iconsdir}/hicolor/*/*/kgoldrunner.*
-%endif
 %{_kde4_appsdir}/kigo/
 %{_kde4_bindir}/kigo
 %{_kde4_configdir}/kigo*.knsrc
@@ -451,6 +435,7 @@ rm -rf %{buildroot}
 # own this, since we have no runtime dep on ggz-base-libs (#645022)
 %dir %{_ggz_configdir}/ggz.modules.d/
 %{_ggz_configdir}/ggz.modules.d/kdegames
+%endif
 
 %files minimal
 %defattr(-,root,root,-)
@@ -485,17 +470,19 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root,-)
 %doc COPYING
+%if 0%{?fedora}
 %{_kde4_libdir}/libiris_ksirk.so.*
+%{_kde4_libdir}/libkolfprivate.so.*
+%{_kde4_libdir}/libpala.so.*
+%endif
 %{_kde4_libdir}/libkdegames.so.*
 %{_kde4_libdir}/libkggzgames.so.*
 %{_kde4_libdir}/libkggzmod.so.*
 %{_kde4_libdir}/libkggznet.so.*
-%{_kde4_libdir}/libkolfprivate.so.*
 %{_kde4_libdir}/libkmahjongglib.so.*
 # still no proper soname here
 %{_kde4_configdir}/kcardtheme.knsrc
 %{_kde4_libdir}/libkcardgame.so
-%{_kde4_libdir}/libpala.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -506,21 +493,28 @@ rm -rf %{buildroot}
 %{_kde4_includedir}/highscore/
 %{_kde4_includedir}/KDE/*
 %{_kde4_includedir}/kgame/
+%if 0%{?fedora}
 %{_kde4_includedir}/Pala/
+%{_kde4_includedir}/libpala/
+%endif
 %{_kde4_includedir}/kggzgames/
 %{_kde4_includedir}/kggzmod/
 %{_kde4_includedir}/kggznet/
-%{_kde4_includedir}/libpala/
+%if 0%{?fedora}
 %dir %{_kde4_libdir}/libpala/
 %{_kde4_libdir}/libpala/*.cmake
+%{_kde4_libdir}/libpala.so
+%endif
 %{_kde4_libdir}/libkdegames.so
 %{_kde4_libdir}/libkggzgames.so
 %{_kde4_libdir}/libkggzmod.so
 %{_kde4_libdir}/libkggznet.so
-%{_kde4_libdir}/libpala.so
 
 
 %changelog
+* Tue Apr 10 2012 Than Ngo <than at redhat.com> - 6:4.8.2-2
+- add rhel condition
+
 * Fri Mar 30 2012 Rex Dieter <rdieter at fedoraproject.org> - 6:4.8.2-1
 - 4.8.2
 
