From 50f580f1805be06ac7598f95ab98c35cf50f5ca1458bc1c579e4606fef351423 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 1 Jun 2014 19:28:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=26 --- kactivities5.spec | 3 ++- kamd-rename.patch | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/kactivities5.spec b/kactivities5.spec index d6a38e6..c940a99 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -36,6 +36,7 @@ BuildRequires: kcoreaddons-devel >= %{_kf5_version} BuildRequires: kdbusaddons-devel >= %{_kf5_version} BuildRequires: kf5-filesystem BuildRequires: ki18n-devel >= %{_kf5_version} +BuildRequires: kio-devel >= %{_kf5_version} BuildRequires: kservice-devel >= %{_kf5_version} BuildRequires: kwindowsystem-devel >= %{_kf5_version} BuildRequires: xz @@ -65,7 +66,7 @@ Summary: KDE Base Libraries Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules >= 0.0.14 -Requires: kdbusaddons-devel >= %{_kf5_version} +Requires: pkgconfig(Qt5Core) >= 5.2.0 Obsoletes: kf5-kactivities-devel %description devel diff --git a/kamd-rename.patch b/kamd-rename.patch index 40844f9..2cd7edb 100644 --- a/kamd-rename.patch +++ b/kamd-rename.patch @@ -29,8 +29,21 @@ index 2a81ff8..fc653a4 100644 #endif } +diff --git a/src/service/Application.cpp b/src/service/Application.cpp +index 7c88f78..217b0d4 100644 +--- a/src/service/Application.cpp ++++ b/src/service/Application.cpp +@@ -349,7 +349,7 @@ int main(int argc, char **argv) + // Starting the dameon + + QProcess::startDetached( +- KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd", ++ KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5", + {"start-daemon"} + ); + diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt -index 46ef942..dd976c3 100644 +index 38e6e2b..fb762e5 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -60,9 +60,9 @@ qt5_add_dbus_adaptor (