[kdebase-runtime] include toggle to omit activitymanager

[Rex Dieter]

commit a7a85ce84fadb9b2a640cb7db039dbbea1d7de02
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 25 19:00:29 2011 -0500

    include toggle to omit activitymanager

 kde-runtime-4.7.2-no_activitymanager.patch |   12 ++++++++++++
 kdebase-runtime.spec                       |   18 +++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/kde-runtime-4.7.2-no_activitymanager.patch b/kde-runtime-4.7.2-no_activitymanager.patch
new file mode 100644
index 0000000..6a9b06f
--- /dev/null
+++ b/kde-runtime-4.7.2-no_activitymanager.patch
@@ -0,0 +1,12 @@
+diff -up kde-runtime-4.7.2/CMakeLists.txt.no_activitymanager kde-runtime-4.7.2/CMakeLists.txt
+--- kde-runtime-4.7.2/CMakeLists.txt.no_activitymanager	2011-09-26 04:40:16.000000000 -0500
++++ kde-runtime-4.7.2/CMakeLists.txt	2011-10-25 18:57:36.367500738 -0500
+@@ -69,7 +69,7 @@ if(NOT WINCE)
+ add_subdirectory(kuiserver)
+ endif(NOT WINCE)
+ add_subdirectory(kwalletd)
+-add_subdirectory(activitymanager)
++#add_subdirectory(activitymanager)
+ if ( UNIX )
+    add_subdirectory(soliduiserver)
+    add_subdirectory(solidautoeject)
diff --git a/kdebase-runtime.spec b/kdebase-runtime.spec
index c72522b..d971978 100644
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@ -8,10 +8,13 @@
 %define xine 1
 %endif
 
+# include activitymanager here(1), or separately in libkactivities(0 or undef)
+%define activitymanager 1
+
 Name:          kdebase-runtime
 Summary:       KDE Runtime
 Version:       4.7.2
-Release:       4%{?dist}
+Release:       5%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -39,6 +42,9 @@ Patch8:        kdebase-runtime-4.5.95-compiz.patch
 # add overrides in default manpath
 Patch9:        kdebase-runtime-4.3.4-man-overrides.patch
 
+# To build/include activitymanager or not
+Patch10: kde-runtime-4.7.2-no_activitymanager.patch
+
 ## upstream patches
 
 Obsoletes: kdebase4-runtime < %{version}-%{release}
@@ -62,6 +68,10 @@ Requires: %{name}-flags = %{version}-%{release}
 # KHelpcenter requires htdig for building search indices
 Requires: htdig
 
+%if ! 0%{?activitymanager}
+Requires: libkactivities%{?_isa}
+%endif
+
 # ensure default/fallback icon theme present
 # beware of bootstrapping, there be dragons
 Requires: oxygen-icon-theme >= %{version}
@@ -138,6 +148,9 @@ BuildArch: noarch
 %patch7 -p1 -b .htsearch
 %patch8 -p1 -b .config
 %patch9 -p1 -b .man-overrides
+%if ! 0%{?activitymanager}
+%patch10 -p1 -b .no_activitymanager
+%endif
 
 
 %build
@@ -292,6 +305,9 @@ fi
 
 
 %changelog
+* Tue Oct 25 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-5
+- include toggle to omit activitymanager
+
 * Mon Oct 24 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-4
 - pkgconfig-style deps