Hello community, here is the log from the commit of package kactivities5 for openSUSE:Factory checked in at 2014-05-14 20:27:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities5 (Old) and /work/SRC/openSUSE:Factory/.kactivities5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kactivities5" Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities5/kactivities5.changes 2014-04-02 17:22:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kactivities5.new/kactivities5.changes 2014-05-14 20:28:30.000000000 +0200 @@ -1,0 +2,17 @@ +Tue May 13 18:49:51 UTC 2014 - [email protected] + +- Mark licence as GPL-2.0+, until the relicensing is done upstream + +------------------------------------------------------------------- +Sun May 4 01:20:20 UTC 2014 - [email protected] + +- Update to 4.99.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta2.php +- Update devel package requires to current reality +- Added kamd-rename.patch: rename kactivitymanagerd binary so it can + co-exist with kactivities4 + +------------------------------------------------------------------- Old: ---- kactivities-4.98.0.tar.xz New: ---- kactivities-4.99.0.tar.xz kamd-rename.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities5.spec ++++++ --- /var/tmp/diff_new_pack.5cV4Fo/_old 2014-05-14 20:28:30.000000000 +0200 +++ /var/tmp/diff_new_pack.5cV4Fo/_new 2014-05-14 20:28:30.000000000 +0200 @@ -18,22 +18,23 @@ %define lname libKF5Activities5 Name: kactivities5 -Version: 4.98.0 +Version: 4.99.0 Release: 0 Summary: KDE Plasma Activities support -License: LGPL-2.0+ and GPL-2.0+ +License: GPL-2.0+ Group: System/GUI/KDE Url: http://projects.kde.org/kactivities Source0: kactivities-%{version}.tar.xz +# 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 >= 0.0.12 +BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{_kf5_version} BuildRequires: kcoreaddons-devel >= %{_kf5_version} BuildRequires: kdbusaddons-devel >= %{_kf5_version} BuildRequires: kf5-filesystem -BuildRequires: kf5umbrella >= %{_kf5_version} BuildRequires: ki18n-devel >= %{_kf5_version} BuildRequires: kservice-devel >= %{_kf5_version} BuildRequires: kwindowsystem-devel >= %{_kf5_version} @@ -46,7 +47,7 @@ BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 Obsoletes: kf5-kactivities -Conflicts: kactivities4 +#Conflicts: kactivities4 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,10 +64,8 @@ Summary: KDE Base Libraries Group: Development/Libraries/KDE Requires: %lname = %{version} -Requires: cmake -Requires: extra-cmake-modules +Requires: extra-cmake-modules >= 0.0.13 Requires: kdbusaddons-devel >= %{_kf5_version} -Requires: kf5umbrella >= %{_kf5_version} Obsoletes: kf5-kactivities-devel %description devel @@ -74,6 +73,7 @@ %prep %setup -q -n kactivities-%{version} +%patch0 -p1 %build %if 0%{?suse_version} == 1310 @@ -93,7 +93,7 @@ %files %defattr(-,root,root) -%{_kf5_bindir}/kactivitymanagerd +%{_kf5_bindir}/kactivitymanagerd5 %{_kf5_qmldir}/org/ %{_kf5_plugindir}/ %{_kf5_servicesdir}/ @@ -111,5 +111,6 @@ %{_kf5_includedir}/*/ %{_kf5_includedir}/*.h %{_kf5_libdir}/pkgconfig/libKActivities.pc +%{_kf5_mkspecsdir}/qt_KActivities.pri %changelog ++++++ kactivities-4.98.0.tar.xz -> kactivities-4.99.0.tar.xz ++++++ ++++ 14741 lines of diff (skipped) ++++++ kamd-rename.patch ++++++ diff --git a/autotests/Process.cpp b/autotests/Process.cpp index a7a0507..afa4bf1 100644 --- a/autotests/Process.cpp +++ b/autotests/Process.cpp @@ -83,7 +83,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 2a81ff8..fc653a4 100644 --- a/src/lib/core/manager_p.cpp +++ b/src/lib/core/manager_p.cpp @@ -94,11 +94,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/CMakeLists.txt b/src/service/CMakeLists.txt index 46ef942..dd976c3 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -60,9 +60,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::Widgets @@ -82,7 +82,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 58ab7df..fb119bf 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[bs]=Menadžer aktivnosti -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
