From 96a94632370c43b4f5751e9931f49e3556b277a2e62433664053320871bea7f9 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 1 Jun 2014 18:42:31 +0000 Subject: [PATCH 1/5] 4.100.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=25 --- kactivities-4.100.0.tar.xz | 3 +++ kactivities-4.99.0.tar.xz | 3 --- kactivities5.changes | 9 +++++++++ kactivities5.spec | 6 +++--- 4 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 kactivities-4.100.0.tar.xz delete mode 100644 kactivities-4.99.0.tar.xz diff --git a/kactivities-4.100.0.tar.xz b/kactivities-4.100.0.tar.xz new file mode 100644 index 0000000..ac9c3e1 --- /dev/null +++ b/kactivities-4.100.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebc8152534a191c92fff129a7405fda8ee15fdaa86d70e678f22c520d7aa04ec +size 120396 diff --git a/kactivities-4.99.0.tar.xz b/kactivities-4.99.0.tar.xz deleted file mode 100644 index 076647e..0000000 --- a/kactivities-4.99.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed27261e5329efa3b490a6e99817d6cfe0c61ff69c1d06dee5c2ebc3c0198c66 -size 120656 diff --git a/kactivities5.changes b/kactivities5.changes index b3b8775..49b3744 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Jun 1 18:02:24 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 4.100.0 + * API improvements and cleanups + * Buildsystem fixes + * For more details please see: + http://www.kde.org/announcements/announce-frameworks5-beta3.php + ------------------------------------------------------------------- Tue May 13 18:49:51 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kactivities5.spec b/kactivities5.spec index 5ce036b..d6a38e6 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -18,7 +18,7 @@ %define lname libKF5Activities5 Name: kactivities5 -Version: 4.99.0 +Version: 4.100.0 Release: 0 Summary: KDE Plasma Activities support License: GPL-2.0+ @@ -29,7 +29,7 @@ Source0: kactivities-%{version}.tar.xz Patch0: kamd-rename.patch BuildRequires: boost-devel >= 1.49.0 BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.13 +BuildRequires: extra-cmake-modules >= 0.0.14 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{_kf5_version} BuildRequires: kcoreaddons-devel >= %{_kf5_version} @@ -64,7 +64,7 @@ Kactivities provides an API for using and interacting with the Plasma Activities Summary: KDE Base Libraries Group: Development/Libraries/KDE Requires: %lname = %{version} -Requires: extra-cmake-modules >= 0.0.13 +Requires: extra-cmake-modules >= 0.0.14 Requires: kdbusaddons-devel >= %{_kf5_version} Obsoletes: kf5-kactivities-devel From 50f580f1805be06ac7598f95ab98c35cf50f5ca1458bc1c579e4606fef351423 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 1 Jun 2014 19:28:56 +0000 Subject: [PATCH 2/5] 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 ( From a66b95b52b145821b06929873d34db39f383691ca34e5e228a28f2b0d0d3816b Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 1 Jun 2014 20:51:08 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=27 --- kactivities5.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/kactivities5.spec b/kactivities5.spec index c940a99..0928352 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -57,6 +57,7 @@ Kactivities provides an API for using and interacting with the Plasma Activities %package -n %lname Summary: Library for KDE's Plasma Activities support Group: System/GUI/KDE +Recommends: %lname-lang = %{version} %description -n %lname Kactivities provides an API for using and interacting with the Plasma Activities Manager. @@ -72,6 +73,7 @@ Obsoletes: kf5-kactivities-devel %description devel Provides the interface and basic tools for the KDE workspace. +%lang_package -n %lname %prep %setup -q -n kactivities-%{version} %patch0 -p1 @@ -88,10 +90,14 @@ Provides the interface and basic tools for the KDE workspace. %kf5_makeinstall -C build %fdupes -s %{buildroot} + %find_lang %{name}5 + %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig +%files -n %lname-lang -f %{name}5.lang + %files %defattr(-,root,root) %{_kf5_bindir}/kactivitymanagerd5 From 20da7173483275d6a14a176627b37e38abda936da5325bca1fe2d13c10f32b65 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 1 Jun 2014 20:58:54 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=28 --- kactivities5.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kactivities5.spec b/kactivities5.spec index 0928352..0d6f202 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -90,13 +90,13 @@ Provides the interface and basic tools for the KDE workspace. %kf5_makeinstall -C build %fdupes -s %{buildroot} - %find_lang %{name}5 + %find_lang %{name} %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig -%files -n %lname-lang -f %{name}5.lang +%files -n %lname-lang -f %{name}.lang %files %defattr(-,root,root) From eee7925ebfb59cc8629558614752da64f458299b5eab260cc31072b9fda81f27 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Tue, 3 Jun 2014 19:22:00 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=29 --- baselibs.conf | 3 +++ kactivities5.changes | 1 + kactivities5.spec | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..7f27922 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,3 @@ +libKF5Activities5 +kactivities5-devel + requires "libKF5Activities5- = " diff --git a/kactivities5.changes b/kactivities5.changes index 49b3744..3f7b4ac 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -6,6 +6,7 @@ Sun Jun 1 18:02:24 UTC 2014 - hrvoje.senjan@gmail.com * Buildsystem fixes * For more details please see: http://www.kde.org/announcements/announce-frameworks5-beta3.php +- Add baselibs.conf ------------------------------------------------------------------- Tue May 13 18:49:51 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kactivities5.spec b/kactivities5.spec index 0d6f202..57f0c1b 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -24,7 +24,8 @@ Summary: KDE Plasma Activities support License: GPL-2.0+ Group: System/GUI/KDE Url: http://projects.kde.org/kactivities -Source0: kactivities-%{version}.tar.xz +Source: http://download.kde.org/unstable/frameworks/%{version}/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