From 54ea3fb951b4342a5a43245312b3822dbc3130f85dac5a3d2682fcd2e728b786 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 26 May 2015 18:12:23 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=75 --- kactivities5.changes | 6 ++++ kactivities5.spec | 9 +---- kamd-rename.patch | 82 -------------------------------------------- 3 files changed, 7 insertions(+), 90 deletions(-) delete mode 100644 kamd-rename.patch diff --git a/kactivities5.changes b/kactivities5.changes index a84ef52..3b10ae9 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 26 18:10:47 UTC 2015 - hrvoje.senjan@gmail.com + +- Unconditionally obsolete kactivities4 +- Drop kamd-rename.patch (kde#348212, kde#347817) + ------------------------------------------------------------------- Sun May 3 19:46:55 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kactivities5.spec b/kactivities5.spec index cb125a5..79f5f97 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -29,8 +29,6 @@ Group: System/GUI/KDE Url: http://projects.kde.org/kactivities Source: http://download.kde.org/stable/frameworks/%{_tar_path}/kactivities-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM kamd-rename.patch -- https://git.reviewboard.kde.org/r/115602/ -- rename kactivitymanagerd binary so it can co-exist with kactivities4 -Patch0: kamd-rename.patch BuildRequires: boost-devel >= 1.49.0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= %{_tar_path} @@ -59,10 +57,8 @@ BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 Recommends: %{name}-imports = %{version} # for kactivitymanagerd_plugin_sqlite.so Recommends: libQt5Sql5-sqlite -%if 0%{?suse_version} > 1320 Provides: kactivities4 = %{version} Obsoletes: kactivities4 < %{version} -%endif #Conflicts: kactivities4 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -101,9 +97,6 @@ Development files. %lang_package -n %lname %prep %setup -q -n kactivities-%{version} -%if 0%{?suse_version} <= 1320 -%patch0 -p1 -%endif %build %if 0%{?suse_version} == 1310 @@ -131,7 +124,7 @@ Development files. %files %defattr(-,root,root) -%{_kf5_bindir}/kactivitymanagerd* +%{_kf5_bindir}/kactivitymanagerd %{_kf5_plugindir}/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ diff --git a/kamd-rename.patch b/kamd-rename.patch deleted file mode 100644 index bfcfb33..0000000 --- a/kamd-rename.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/autotests/core/Process.cpp b/autotests/core/Process.cpp -index 664dc93..0a3f281 100644 ---- a/autotests/core/Process.cpp -+++ b/autotests/core/Process.cpp -@@ -85,7 +85,7 @@ void Modifier::initTestCase() - // qDebug() << env; - - s_process->setEnvironment(env); -- s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd")); -+ s_process->start(QStringLiteral(KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5")); - s_process->waitForStarted(); - - -diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp -index 6c6130b..ac17bf0 100644 ---- a/src/lib/core/manager_p.cpp -+++ b/src/lib/core/manager_p.cpp -@@ -72,11 +72,11 @@ Manager *Manager::self() - ->property("org.kde.KActivities.core.disableAutostart") - .toBool()) { - qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon"; -- QProcess::startDetached(QStringLiteral("kactivitymanagerd")); -+ QProcess::startDetached(QStringLiteral("kactivitymanagerd5")); - } - - #else -- QProcess::startDetached(QStringLiteral("kactivitymanagerd")); -+ QProcess::startDetached(QStringLiteral("kactivitymanagerd5")); - #endif - } - -diff --git a/src/service/Application.cpp b/src/service/Application.cpp -index ec74daa..83dbf86 100644 ---- a/src/service/Application.cpp -+++ b/src/service/Application.cpp -@@ -364,7 +364,7 @@ int main(int argc, char **argv) - // Starting the dameon - - QProcess::startDetached( -- KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd", -+ KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5", - QStringList{"start-daemon"} - ); - -diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt -index 5c8ecc5..adf72b4 100644 ---- a/src/service/CMakeLists.txt -+++ b/src/service/CMakeLists.txt -@@ -64,9 +64,9 @@ qt5_add_dbus_adaptor ( - Features.h Features - ) - --add_executable (kactivitymanagerd ${kactivitymanager_SRCS}) -+add_executable (kactivitymanagerd5 ${kactivitymanager_SRCS}) - --target_link_libraries (kactivitymanagerd -+target_link_libraries (kactivitymanagerd5 - Qt5::Core - Qt5::DBus - Qt5::Gui -@@ -86,7 +86,7 @@ install (FILES - ) - - install (TARGETS -- kactivitymanagerd ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} -+ kactivitymanagerd5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} - ) - - install (FILES -diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop -index 710f09d..c1a45e3 100644 ---- a/src/service/files/kactivitymanagerd.desktop -+++ b/src/service/files/kactivitymanagerd.desktop -@@ -4,7 +4,7 @@ Icon=preferences-activities - X-KDE-ServiceTypes= - X-DBUS-StartupType=Unique - X-KDE-StartupNotify=false --Exec=kactivitymanagerd -+Exec=kactivitymanagerd5 - - Name=Activity Manager - Name[ar]=مدير الأنشطة