From 9d72cba9654e0ee8fd82a93fb9154b1276546f57687ebc69a2e3651f0271e3ff Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 26 Apr 2015 00:05:27 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=68 --- kactivities5.changes | 6 ++++++ kactivities5.spec | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/kactivities5.changes b/kactivities5.changes index f8b878f..ea56701 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Apr 26 00:04:45 UTC 2015 - hrvoje.senjan@gmail.com + +- Obsolete kactivities4 for openSUSE > 13.2 +- Apply kamd-rename.patch for <= 13.2 + ------------------------------------------------------------------- Sat Apr 4 14:40:46 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kactivities5.spec b/kactivities5.spec index 3435f25..5a56aa3 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -58,6 +58,9 @@ BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 Recommends: %{name}-imports = %{version} # for kactivitymanagerd_plugin_sqlite.so Recommends: libQt5Sql5-sqlite +%if 0%{?suse_version} > 1320 +Obsoletes: kactivities4 +%endif #Conflicts: kactivities4 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -96,7 +99,9 @@ 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 From 92ef7bd3a9c7e043513ea90587a967c7ad5120c7303d45dc61475d5df36f0c39 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 26 Apr 2015 00:13:27 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=69 --- kactivities5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kactivities5.spec b/kactivities5.spec index 5a56aa3..42bd6c6 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -129,7 +129,7 @@ Development files. %files %defattr(-,root,root) -%{_kf5_bindir}/kactivitymanagerd5 +%{_kf5_bindir}/kactivitymanagerd* %{_kf5_plugindir}/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ From e39bae14007e85739fa8a78cc784090f7f2dd1d9b0caa13bb9e477f12f092d75 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 27 Apr 2015 00:08:57 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=70 --- kactivities5.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kactivities5.spec b/kactivities5.spec index 42bd6c6..b399f9e 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -59,7 +59,8 @@ Recommends: %{name}-imports = %{version} # for kactivitymanagerd_plugin_sqlite.so Recommends: libQt5Sql5-sqlite %if 0%{?suse_version} > 1320 -Obsoletes: kactivities4 +Provides: kactivities4 = %{version} +Obsoletes: kactivities4 < %{version} %endif #Conflicts: kactivities4 BuildRoot: %{_tmppath}/%{name}-%{version}-build From 47d3308007c50a667ec9c2d256b3d0d2eb90eefe8e508a3abb94fac168cdbc4b Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 3 May 2015 19:47:01 +0000 Subject: [PATCH 4/6] 5.10.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=71 --- kactivities-5.10.0.tar.xz | 3 +++ kactivities-5.9.0.tar.xz | 3 --- kactivities5.changes | 7 +++++++ kactivities5.spec | 5 +++-- 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 kactivities-5.10.0.tar.xz delete mode 100644 kactivities-5.9.0.tar.xz diff --git a/kactivities-5.10.0.tar.xz b/kactivities-5.10.0.tar.xz new file mode 100644 index 0000000..a711cc8 --- /dev/null +++ b/kactivities-5.10.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:534b79658d0cbb58e599ea2dadc9fe364c8279ac2895ab536a9f2c98b6f44c34 +size 144580 diff --git a/kactivities-5.9.0.tar.xz b/kactivities-5.9.0.tar.xz deleted file mode 100644 index e83b9b5..0000000 --- a/kactivities-5.9.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55d19bbb9a67d00b0623e077a50f46358045f36fe4d4c6d66af0d6e565faf052 -size 141484 diff --git a/kactivities5.changes b/kactivities5.changes index ea56701..a5d471e 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun May 3 19:46:55 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.10.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.10.0.php + ------------------------------------------------------------------- Sun Apr 26 00:04:45 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kactivities5.spec b/kactivities5.spec index b399f9e..cb125a5 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Activities5 -%define _tar_path 5.9 +%define _tar_path 5.10 Name: kactivities5 -Version: 5.9.0 +Version: 5.10.0 Release: 0 %define kf5_version %{version} Summary: KDE Plasma Activities support @@ -52,6 +52,7 @@ BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5DBus) >= 5.2.0 BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 BuildRequires: pkgconfig(Qt5Qml) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Quick) >= 5.2.0 BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 From 075362656acf8e9df6aa70a8e7f6573f6ee66299bdccf9adf7f4180539db7e08 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 3 May 2015 20:06:13 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=72 --- kactivities5.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/kactivities5.changes b/kactivities5.changes index a5d471e..a84ef52 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -4,6 +4,7 @@ Sun May 3 19:46:55 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.10.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.10.0.php +- Added pkgconfig(Qt5Quick) >= 5.2.0 BuildRequires ------------------------------------------------------------------- Sun Apr 26 00:04:45 UTC 2015 - hrvoje.senjan@gmail.com From ebea39fb6e189e4225c2a550132dc065a8f1700a5dbb8a7918615d9c843f2a1c Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 4 May 2015 13:04:21 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=73 --- kamd-rename.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kamd-rename.patch b/kamd-rename.patch index 5812228..bfcfb33 100644 --- a/kamd-rename.patch +++ b/kamd-rename.patch @@ -12,10 +12,10 @@ index 664dc93..0a3f281 100644 diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp -index 09003c1..984c910 100644 +index 6c6130b..ac17bf0 100644 --- a/src/lib/core/manager_p.cpp +++ b/src/lib/core/manager_p.cpp -@@ -64,11 +64,11 @@ Manager *Manager::self() +@@ -72,11 +72,11 @@ Manager *Manager::self() ->property("org.kde.KActivities.core.disableAutostart") .toBool()) { qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon"; @@ -30,10 +30,10 @@ index 09003c1..984c910 100644 } diff --git a/src/service/Application.cpp b/src/service/Application.cpp -index eef0eb4..6e2f7d7 100644 +index ec74daa..83dbf86 100644 --- a/src/service/Application.cpp +++ b/src/service/Application.cpp -@@ -360,7 +360,7 @@ int main(int argc, char **argv) +@@ -364,7 +364,7 @@ int main(int argc, char **argv) // Starting the dameon QProcess::startDetached( @@ -43,10 +43,10 @@ index eef0eb4..6e2f7d7 100644 ); diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt -index 68ad30b..750a85d 100644 +index 5c8ecc5..adf72b4 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt -@@ -63,9 +63,9 @@ qt5_add_dbus_adaptor ( +@@ -64,9 +64,9 @@ qt5_add_dbus_adaptor ( Features.h Features ) @@ -57,8 +57,8 @@ index 68ad30b..750a85d 100644 +target_link_libraries (kactivitymanagerd5 Qt5::Core Qt5::DBus - Qt5::Widgets -@@ -85,7 +85,7 @@ install (FILES + Qt5::Gui +@@ -86,7 +86,7 @@ install (FILES ) install (TARGETS @@ -68,7 +68,7 @@ index 68ad30b..750a85d 100644 install (FILES diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop -index b3d698f..a662bcf 100644 +index 710f09d..c1a45e3 100644 --- a/src/service/files/kactivitymanagerd.desktop +++ b/src/service/files/kactivitymanagerd.desktop @@ -4,7 +4,7 @@ Icon=preferences-activities