[kactivities] nepomuk subpkg instead (still needed by plasma-mobile, at least)

[Rex Dieter]

commit 400d9ba8ef9086c6e67066269e2919b805fcb67a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue May 13 12:15:41 2014 -0500

    nepomuk subpkg instead (still needed by plasma-mobile, at least)

 kactivities.spec |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)
---
diff --git a/kactivities.spec b/kactivities.spec
index 11a391d..0363fe8 100644
--- a/kactivities.spec
+++ b/kactivities.spec
@@ -1,13 +1,11 @@
 
-## include nepomuk support (default off)
-%if 0%{?fedora} < 21
+## include -nepomuk subpkg support
 %define nepomuk 1
-%endif
 
 Name:    kactivities
 Summary: API for using and interacting with Activities 
 Version: 4.13.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+ and LGPLv2+
 URL:     https://projects.kde.org/projects/kde/kdelibs/kactivities
@@ -20,9 +18,8 @@ URL:     https://projects.kde.org/projects/kde/kdelibs/kactivities
 Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
 BuildRequires: kdelibs4-devel >= %{version}
-%if 0%{?nepomuk}
-BuildRequires: nepomuk-core-devel >= %{version}
-BuildRequires: pkgconfig(soprano)
+%if ! 0%{?nepomuk}
+Obsoletes: %{name}-nepomuk < %{version}-%{release}
 %endif
 
 %if 0%{?rhel} == 6
@@ -44,11 +41,28 @@ Provides:  libkactivities = 6.1-100
 API for using and interacting with Activities as a consumer, 
 application adding information to them or as an activity manager.
 
+%if 0%{?nepomuk}
+%package nepomuk
+Summary: KActivities nepomuk support
+BuildRequires: nepomuk-core-devel >= %{version}
+BuildRequires: pkgconfig(soprano)
+# upgrade path
+Obsoletes: kactivities < 4.13.0-2
+Requires: %{name}%{?_isa} = %{version}-%{release}
+# not sure if an explicit dep is needed or worth it -- rex
+#Requires: nepomuk-core%{?_isa} >= %{version}
+%description nepomuk
+%{summary}.
+%endif
+
 %package devel
 Summary: Developer files for %{name}
 Obsoletes: libkactivities-devel < 6.1-100
 Provides:  libkactivities-devel = 6.1-100
 Requires: %{name}%{?_isa} = %{version}-%{release}
+%if 0%{?nepomuk}
+Requires: %{name}-nepomuk%{?_isa} = %{version}-%{release}
+%endif
 Requires: kdelibs4-devel
 %description devel
 %{summary}.
@@ -116,7 +130,13 @@ rm -rfv %{buildroot}%{_kde4_datadir}/ontology/kde/
 %{_kde4_datadir}/kde4/services/kactivitymanagerd.desktop
 %{_kde4_datadir}/kde4/services/kcm_activities.desktop
 %{_kde4_datadir}/kde4/servicetypes/activitymanager-plugin.desktop
+%{_kde4_appsdir}/activitymanager/
+
 %if 0%{?nepomuk}
+%post nepomuk -p /sbin/ldconfig
+%postun nepomuk -p /sbin/ldconfig
+
+%files nepomuk
 %{_kde4_libdir}/kde4/kio_activities.so
 %{_kde4_libdir}/libkactivities-models.so.1*
 %{_kde4_libdir}/kde4/activitymanager_plugin_nepomuk.so
@@ -128,7 +148,6 @@ rm -rfv %{buildroot}%{_kde4_datadir}/ontology/kde/
 %dir %{_kde4_libdir}/kde4/imports/org/kde
 %{_kde4_libdir}/kde4/imports/org/kde/activities
 %endif
-%{_kde4_appsdir}/activitymanager/
 
 %files devel
 %{_kde4_libdir}/libkactivities.so
@@ -145,6 +164,9 @@ rm -rfv %{buildroot}%{_kde4_datadir}/ontology/kde/
 
 
 %changelog
+* Tue May 13 2014 Rex Dieter <rdieter at fedoraproject.org> 4.13.1-2
+- -nepomuk subpkg instead (still needed by plasma-mobile, at least)
+
 * Sat May 10 2014 Rex Dieter <rdieter at fedoraproject.org> 4.13.1-1
 - 4.13.1