From 0532f27e04ba38240b13821f3f5f241ee1711d042d8fafbb226de01313dd65e2 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 9 Sep 2014 10:11:08 +0000 Subject: [PATCH 1/5] 5.2.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=39 --- kactivities-5.1.0.tar.xz | 3 --- kactivities-5.2.0.tar.xz | 3 +++ kactivities5.changes | 7 +++++++ kactivities5.spec | 6 +++--- 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 kactivities-5.1.0.tar.xz create mode 100644 kactivities-5.2.0.tar.xz diff --git a/kactivities-5.1.0.tar.xz b/kactivities-5.1.0.tar.xz deleted file mode 100644 index 811d11a..0000000 --- a/kactivities-5.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac0e08b701709354af4141aacc624138f05116767585f0cce1e7901e861f514d -size 115692 diff --git a/kactivities-5.2.0.tar.xz b/kactivities-5.2.0.tar.xz new file mode 100644 index 0000000..a7e17b4 --- /dev/null +++ b/kactivities-5.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c5be79b9393b78e1cfd370f2e4ca2f7d26f94957da69bf63d4df210f3d7d277 +size 111064 diff --git a/kactivities5.changes b/kactivities5.changes index 44fe45a..740d914 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 9 09:49:28 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.2.0 + * For more details please see: + http://kde.org/announcements/kde-frameworks-5.2.php + ------------------------------------------------------------------- Sat Aug 2 10:20:10 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kactivities5.spec b/kactivities5.spec index 119adb5..7bd2f5e 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -18,7 +18,7 @@ %define lname libKF5Activities5 Name: kactivities5 -Version: 5.1.0 +Version: 5.2.0 Release: 0 %define kf5_version %{version} Summary: KDE Plasma Activities support @@ -31,7 +31,7 @@ Source1: baselibs.conf Patch0: kamd-rename.patch BuildRequires: boost-devel >= 1.49.0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.1.0 +BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kcoreaddons-devel >= %{kf5_version} @@ -78,7 +78,7 @@ QML imports. Summary: KDE Plasma Activities support Group: Development/Libraries/KDE Requires: %lname = %{version} -Requires: extra-cmake-modules >= 1.1.0 +Requires: extra-cmake-modules >= 1.2.0 Requires: pkgconfig(Qt5Core) >= 5.2.0 %description devel From 957259fd07f3d1251786fc556ea877d3ab14e9dd9916d9bbfd92c7727a7ac9cc Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 9 Sep 2014 14:08:58 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=40 --- kamd-rename.patch | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/kamd-rename.patch b/kamd-rename.patch index daa8348..8c37afd 100644 --- a/kamd-rename.patch +++ b/kamd-rename.patch @@ -12,7 +12,7 @@ index a7a0507..afa4bf1 100644 diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp -index 2a81ff8..fc653a4 100644 +index 077c634..7be66dd 100644 --- a/src/lib/core/manager_p.cpp +++ b/src/lib/core/manager_p.cpp @@ -94,11 +94,11 @@ Manager *Manager::self() @@ -30,23 +30,32 @@ index 2a81ff8..fc653a4 100644 } diff --git a/src/service/Application.cpp b/src/service/Application.cpp -index 09332f8..572fe48 100644 +index 6b0e3e1..3894540 100644 --- a/src/service/Application.cpp +++ b/src/service/Application.cpp -@@ -351,7 +351,7 @@ int main(int argc, char **argv) +@@ -280,7 +280,7 @@ int main(int argc, char **argv) + application.setApplicationName(QStringLiteral("ActivityManager")); + application.setOrganizationDomain(QStringLiteral("kde.org")); + +- // KAboutData about("kactivitymanagerd", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0", ++ // KAboutData about("kactivitymanagerd5", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0", + // ki18n("KDE Activity Management Service"), + // KAboutData::License_GPL, + // ki18n("(c) 2010, 2011, 2012 Ivan Cukic"), KLocalizedString(), +@@ -333,7 +333,7 @@ int main(int argc, char **argv) // Starting the dameon QProcess::startDetached( - KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd", + KAMD_INSTALL_PREFIX "/bin/kactivitymanagerd5", - {"start-daemon"} + QStringList{"start-daemon"} ); diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt -index 38e6e2b..fb762e5 100644 +index 4b4978b..2220f34 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt -@@ -60,9 +60,9 @@ qt5_add_dbus_adaptor ( +@@ -62,9 +62,9 @@ qt5_add_dbus_adaptor ( Features.h Features ) @@ -58,7 +67,7 @@ index 38e6e2b..fb762e5 100644 Qt5::Core Qt5::DBus Qt5::Widgets -@@ -82,7 +82,7 @@ install (FILES +@@ -84,7 +84,7 @@ install (FILES ) install (TARGETS From a6a7b137b52d8ceb4a7e77df0f935d4f24c6c30c4a17037820def7089cc343d9 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 9 Sep 2014 14:18:41 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=41 --- kactivities5.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kactivities5.spec b/kactivities5.spec index 7bd2f5e..6049739 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -33,14 +33,18 @@ BuildRequires: boost-devel >= 1.49.0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.2.0 BuildRequires: fdupes +BuildRequires: kcmutils-devel >= %{kf5_version} BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kcoreaddons-devel >= %{kf5_version} BuildRequires: kdbusaddons-devel >= %{kf5_version} +BuildRequires: kdeclarative-devel >= %{kf5_version} BuildRequires: kf5-filesystem +BuildRequires: kglobalaccel-devel >= %{kf5_version} BuildRequires: ki18n-devel >= %{kf5_version} BuildRequires: kio-devel >= %{kf5_version} BuildRequires: kservice-devel >= %{kf5_version} BuildRequires: kwindowsystem-devel >= %{kf5_version} +BuildRequires: kxmlgui-devel >= %{kf5_version} BuildRequires: xz BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 From fded09aa8d37ec70073bc7471a7a7991a6b1691ce7fc31fb743c3fa50c7f190e Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 9 Sep 2014 14:25:32 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=42 --- kactivities5.changes | 3 +++ kactivities5.spec | 1 + 2 files changed, 4 insertions(+) diff --git a/kactivities5.changes b/kactivities5.changes index 740d914..a1c38e3 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -4,6 +4,9 @@ Tue Sep 9 09:49:28 UTC 2014 - hrvoje.senjan@gmail.com - Update to 5.2.0 * For more details please see: http://kde.org/announcements/kde-frameworks-5.2.php +- Added kcmutils-devel, kdeclarative-devel, kglobalaccel-devel and + kxmlgui-devel BuildRequires +- Rebase kamd-rename.patch ------------------------------------------------------------------- Sat Aug 2 10:20:10 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kactivities5.spec b/kactivities5.spec index 6049739..0373571 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -120,6 +120,7 @@ Development files. %{_kf5_plugindir}/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ +%{_kf5_datadir}/ %files imports %defattr(-,root,root) From 99ed82db3041404c7cdd62cf66357d4b4335e7b886917f84c03d8a96999a46f2 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 10 Sep 2014 15:20:03 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=43 --- kactivities5.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kactivities5.changes b/kactivities5.changes index a1c38e3..5b4f720 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -2,6 +2,8 @@ Tue Sep 9 09:49:28 UTC 2014 - hrvoje.senjan@gmail.com - Update to 5.2.0 + * KActivities: reimplementation of the file item plugin for + linking files to activities * For more details please see: http://kde.org/announcements/kde-frameworks-5.2.php - Added kcmutils-devel, kdeclarative-devel, kglobalaccel-devel and