[kdebase-runtime] active-development-4.7-diff.patch omit activitymanger unconditionally drop dep on libkactivities

[Rex Dieter]

commit 014dfa3ba45418d6ca369c58742e3cbe79306cc0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Nov 17 11:01:41 2011 -0600

    active-development-4.7-diff.patch
    omit activitymanger unconditionally
    drop dep on libkactivities

 active-development-4.7-diff-1.patch |   40 +++++++++++++++++++++++++++++++++++
 kdebase-runtime.spec                |   22 +++++++++---------
 2 files changed, 51 insertions(+), 11 deletions(-)
---
diff --git a/active-development-4.7-diff-1.patch b/active-development-4.7-diff-1.patch
new file mode 100644
index 0000000..023d907
--- /dev/null
+++ b/active-development-4.7-diff-1.patch
@@ -0,0 +1,40 @@
+diff --git a/nepomuk/ontologies/kext.trig b/nepomuk/ontologies/kext.trig
+index be5d041..b743638 100644
+--- a/nepomuk/ontologies/kext.trig
++++ b/nepomuk/ontologies/kext.trig
+@@ -94,6 +94,35 @@ kext: {
+           rdfs:range xsd:string ;
+           nrl:cardinality 1 ;
+           nao:userVisible false .
++
++    kext:ResourceScoreCache
++          a rdfs:Class ;
++          rdfs:subClassOf rdfs:Resource ;
++          rdfs:label "Resource score cache" ;
++          rdfs:comment "For storing the automatically calculated score based on the usage statistics" ;
++          nao:userVisible false .
++
++    kext:targettedResource
++          a rdf:Property ;
++          rdfs:comment "Resource for which the score is calculated." ;
++          rdfs:domain kext:ResourceScoreCache ;
++          rdfs:label "resource" ;
++          rdfs:range rdfs:Resource .
++
++    kext:initiatingAgent
++          a rdf:Property ;
++          rdfs:comment "Relates the score to the agent initiating the events." ;
++          rdfs:domain kext:ResourceScoreCache ;
++          rdfs:label "involved agent" ;
++          rdfs:range nao:Agent .
++
++    kext:cachedScore
++          a rdf:Property ;
++          rdfs:subPropertyOf nao:score ;
++          rdfs:comment "The automatically calculated score" ;
++          rdfs:domain kext:ResourceScoreCache ;
++          rdfs:label "calculated score" ;
++          rdfs:range xsd:float .
+ }
+ 
+ <http://nepomuk.kde.org/ontologies/2010/11/29/kext/metadata> {
diff --git a/kdebase-runtime.spec b/kdebase-runtime.spec
index 3940677..0e53fac 100644
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@ -8,13 +8,10 @@
 %define xine 1
 %endif
 
-# include activitymanager here(0/undef), or separately in libkactivities(1)
-%define no_activitymanager 1
-
 Name:          kdebase-runtime
 Summary:       KDE Runtime
 Version:       4.7.3
-Release:       11%{?dist}
+Release:       12%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -42,12 +39,15 @@ 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
+# omit activitymanager (in favor of standalone libkactivities)
 Patch10: kde-runtime-4.7.2-no_activitymanager.patch
 
 ## upstreamable patches
 
 ## upstream patches
+# based on patch from ftp://ftp.kde.org/pub/kde/stable/active/1.0/src/
+# includes only the piece wrt additional nepomuk ontologies
+Patch100: active-development-4.7-diff-1.patch
 
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
@@ -72,10 +72,6 @@ Requires: htdig
 # Nepomuk requires pdftotext for indexing PDFs
 Requires: poppler-utils
 
-%if 0%{?no_activitymanager}
-Requires: libkactivities%{?_isa}
-%endif
-
 # ensure default/fallback icon theme present
 # beware of bootstrapping, there be dragons
 Requires: oxygen-icon-theme >= %{version}
@@ -152,9 +148,8 @@ BuildArch: noarch
 %patch7 -p1 -b .htsearch
 %patch8 -p1 -b .config
 %patch9 -p1 -b .man-overrides
-%if 0%{?no_activitymanager}
 %patch10 -p1 -b .no_activitymanager
-%endif
+%patch100 -p1 -b .active-development-4.7
 
 
 %build
@@ -309,6 +304,11 @@ fi
 
 
 %changelog
+* Thu Nov 17 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-12
+- active-development-4.7-diff.patch
+- omit activitymanger unconditionally
+- drop dep on libkactivities
+
 * Tue Nov 15 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-11
 - BR: libjpeg-devel