From 972d7024c9e8cb1313e7b79a4b7c705a3c7e2e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Mon, 14 Mar 2016 11:29:17 +0100
Subject: [PATCH] KDE Frameworks 5.20

---
 kf5-kactivities.spec | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/kf5-kactivities.spec b/kf5-kactivities.spec
index d6cdc05..63376bb 100644
--- a/kf5-kactivities.spec
+++ b/kf5-kactivities.spec
@@ -2,7 +2,7 @@
 
 Name:           kf5-%{framework}
 Summary:        A KDE Frameworks 5 Tier 3 to organize user work into separate activities
-Version:        5.19.0
+Version:        5.20.0
 Release:        1%{?dist}
 
 License:        GPLv2+ and LGPLv2+
@@ -16,6 +16,7 @@ URL:            https://projects.kde.org/kactivities
 %global stable stable
 %endif
 Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
+Source1:        http://download.kde.org/stable/kactivities/kactivities-workspace-5.5.0.tar.xz
 
 BuildRequires:  boost-devel
 BuildRequires:  extra-cmake-modules >= %{version}
@@ -48,7 +49,7 @@ consumer, application adding information to them or as an activity manager.
 %package libs
 Summary:        Libraries for KActivities framework
 Requires:       kf5-filesystem
-Requires:       %{name} = %{version}-%{release}
+#Requires:       %{name} = %{version}-%{release}
 %description    libs
 %{summary}.
 
@@ -61,7 +62,7 @@ Requires:       qt5-qtbase-devel
 
 
 %prep
-%setup -q -n %{framework}-%{version}
+%setup -a 1 -n %{framework}-%{version}
 
 
 %build
@@ -69,35 +70,32 @@ mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} ..
 popd
-
 make %{?_smp_mflags} -C %{_target_platform}
 
+mkdir %{_target_platform}-workspace
+pushd %{_target_platform}-workspace
+%{cmake_kf5} ..
+popd
+make %{?_smp_mflags} -C %{_target_platform}-workspace
+
 
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-
-%find_lang kactivities5_qt --with-qt --all-name
-
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}-workspace
 
 %files
 %doc README.md
 %license COPYING*
-%{_kf5_bindir}/kactivitymanagerd
-%{_kf5_datadir}/kservices5/*.desktop
-%{_kf5_datadir}/kservices5/activities.protocol
-%{_kf5_datadir}/kservicetypes5/kactivitymanagerd-plugin.desktop
-%{_kf5_datadir}/kf5/kactivitymanagerd/
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
-%files libs -f kactivities5_qt.lang
+%files libs
 %{_kf5_libdir}/libKF5Activities.so.*
 # plugins, misc multilib bits
-%{_kf5_libdir}/libkactivitymanagerd_plugin.so
 %{_kf5_qmldir}/org/kde/activities/
-%{_kf5_qtplugindir}/kactivitymanagerd/
-%{_kf5_qtplugindir}/*.so
+#%{_kf5_qtplugindir}/*.so
+#%{_kf5_datadir}/kservices5/activities.protocol
 
 %files devel
 %{_kf5_libdir}/libKF5Activities.so