kactivities-workspace subpkg

.gitignore

@@ -1 +1,2 @@
 /kactivitymanagerd-5.5.0.tar.xz
+/kactivities-workspace-5.5.0.tar.xz

kactivitymanagerd.spec

@@ -1,7 +1,7 @@
 Name:           kactivitymanagerd
 Summary:        Plasma service to manage user's activities
 Version:        5.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPLv2+
 URL:            https://projects.kde.org/projects/kde/workspace/%{name}
@@ -12,8 +12,9 @@ URL:            https://projects.kde.org/projects/kde/workspace/%{name}
 %else
 %global stable stable
 %endif
-Source0:        http://download.kde.org/%{stable}/kactivities/%{name}-%{version}.tar.xz
 #Source0:       http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
+Source0:        http://download.kde.org/%{stable}/kactivities/%{name}-%{version}.tar.xz
+Source1:        http://download.kde.org/stable/kactivities/kactivities-workspace-%{version}.tar.xz
 
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  extra-cmake-modules
@@ -42,12 +43,24 @@ Obsoletes:      kactivities < 4.90.0
 Provides:       kactivities%{?_isa} = %{version}-%{release}
 Provides:       kactivities = %{version}-%{release}
 
+## TEMPORARY, remove when 5.6 lands
+Requires: kactivities-workspace = %{version}-%{release}
+
 %description
 %{summary}.
 
+## TEMPORARY, will (should-be) Obsoletes/Provides'd by plasma-desktop-5.6.x
+%package -n kactivities-workspace
+Summary: Kactivities workspace components
+# upgrade path
+Obsoletes: kf5-kactivities < 5.21.0
+Requires: %{name} = %{version}-%{release}
+%description -n kactivities-workspace
+%{summary}, including: kcm, kio, qml components.
+
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version} -a1
 
 
 %build
@@ -58,11 +71,22 @@ popd
 
 make %{?_smp_mflags} -C %{_target_platform}
 
+mkdir kactivities-workspace-%{version}/%{_target_platform}
+pushd kactivities-workspace-%{version}/%{_target_platform}
+%{cmake_kf5} ..
+popd
+make %{?_smp_mflags} -C kactivities-workspace-%{version}/%{_target_platform}
+
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C kactivities-workspace-%{version}/%{_target_platform}
+
 %find_lang kactivities5 --with-qt
 
+# unpackaged files
+rm -fv %{buildroot}%{_kf5_qmldir}/org/kde/activities/{libkactivitiesextensionplugin.so,qmldir}
+
 
 %files -f kactivities5.lang
 %license COPYING*
@@ -73,8 +97,21 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %{_kf5_datadir}/kservices5/kactivitymanagerd.desktop
 %{_kf5_datadir}/kservicetypes5/kactivitymanagerd-plugin.desktop
 
+%files -n kactivities-workspace
+%{_kf5_qtplugindir}/kactivitymanagerd_fileitem_linking_plugin.so
+%{_kf5_qtplugindir}/kcm_activities.so
+%{_kf5_qtplugindir}/kio_activities.so
+%{_kf5_qmldir}/org/kde/activities/settings/
+%{_kf5_datadir}/kf5/kactivitymanagerd/
+%{_kf5_datadir}/kservices5/activities.protocol
+%{_kf5_datadir}/kservices5/kactivitymanagerd_fileitem_linking_plugin.desktop
+%{_kf5_datadir}/kservices5/kcm_activities.desktop
+
 
 %changelog
+* Sun Apr 03 2016 Rex Dieter <rdieter@fedoraprojecr.org> 5.5.0-2
+- kactivities-workspace subpkg
+
 * Fri Mar 25 2016 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-1
 - import 5.5.0 (until plasma-5.6 lands)
 - safer Obsoletes/Provides: kf5-kactivities

sources

@@ -1 +1,2 @@
 f758ac4f9935db8acd08fa04ecd5e4c5  kactivitymanagerd-5.5.0.tar.xz
+e1eac5fa8c9cf4e72efe019500292130  kactivities-workspace-5.5.0.tar.xz