From a2ffd461e4b0bf967578a672504c1bc0a0094e17e3be2836fadc22c52af20e2e Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 28 Jul 2014 17:30:01 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=36 --- kactivities5.changes | 7 +++++++ kactivities5.spec | 23 ++++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/kactivities5.changes b/kactivities5.changes index c7cc2ae..1ccac6f 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 28 17:27:57 UTC 2014 - hrvoje.senjan@gmail.com + +- Split out imports to separate package +- Improve devel subpackage summary and description +- Recommends libQt5Sql5-sqlite for sqlite plugin + ------------------------------------------------------------------- Fri Jul 11 09:29:08 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kactivities5.spec b/kactivities5.spec index 1b03c55..c827c96 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -49,7 +49,9 @@ BuildRequires: pkgconfig(Qt5Qml) >= 5.2.0 BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 BuildRequires: pkgconfig(Qt5Test) >= 5.2.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 -Obsoletes: kf5-kactivities +Recommends: %{name}-imports = %{version} +# for kactivitymanagerd_plugin_sqlite.so +Recommends: libQt5Sql5-sqlite #Conflicts: kactivities4 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,16 +66,24 @@ Recommends: %lname-lang = %{version} %description -n %lname Kactivities provides an API for using and interacting with the Plasma Activities Manager. +%package imports +Summary: KDE Plasma Activities support +Group: System/GUI/KDE + +%description imports +Kactivities provides an API for using and interacting with the Plasma Activities Manager. +QML imports. + %package devel -Summary: KDE Base Libraries +Summary: KDE Plasma Activities support Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules >= 1.0.0 Requires: pkgconfig(Qt5Core) >= 5.2.0 -Obsoletes: kf5-kactivities-devel %description devel -Provides the interface and basic tools for the KDE workspace. +Kactivities provides an API for using and interacting with the Plasma Activities Manager. +Development files. %lang_package -n %lname %prep @@ -103,11 +113,14 @@ Provides the interface and basic tools for the KDE workspace. %files %defattr(-,root,root) %{_kf5_bindir}/kactivitymanagerd5 -%{_kf5_qmldir}/org/ %{_kf5_plugindir}/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ +%files imports +%defattr(-,root,root) +%{_kf5_qmldir}/ + %files -n %lname %defattr(-,root,root,-) %{_kf5_libdir}/libKF5Activities.so.* From 3c722ed573770b58a24d2c77bab41569d914810bc1cf08386e82e9faded00ecc Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 2 Aug 2014 13:17:16 +0000 Subject: [PATCH 2/2] 5.1.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities5?expand=0&rev=37 --- kactivities-5.0.0.tar.xz | 3 --- kactivities-5.1.0.tar.xz | 3 +++ kactivities5.changes | 7 +++++++ kactivities5.spec | 6 +++--- 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 kactivities-5.0.0.tar.xz create mode 100644 kactivities-5.1.0.tar.xz diff --git a/kactivities-5.0.0.tar.xz b/kactivities-5.0.0.tar.xz deleted file mode 100644 index 6f0100f..0000000 --- a/kactivities-5.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d117a12bdaadb5f65103ddee89f745bf10edf7afe8f153f97ae32877d29d7fb -size 115152 diff --git a/kactivities-5.1.0.tar.xz b/kactivities-5.1.0.tar.xz new file mode 100644 index 0000000..811d11a --- /dev/null +++ b/kactivities-5.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac0e08b701709354af4141aacc624138f05116767585f0cce1e7901e861f514d +size 115692 diff --git a/kactivities5.changes b/kactivities5.changes index 1ccac6f..44fe45a 100644 --- a/kactivities5.changes +++ b/kactivities5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Aug 2 10:20:10 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.1.0 + * For more details please see: + http://www.kde.org/announcements/kde-frameworks-5.1.php + ------------------------------------------------------------------- Mon Jul 28 17:27:57 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/kactivities5.spec b/kactivities5.spec index c827c96..119adb5 100644 --- a/kactivities5.spec +++ b/kactivities5.spec @@ -18,7 +18,7 @@ %define lname libKF5Activities5 Name: kactivities5 -Version: 5.0.0 +Version: 5.1.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.0.0 +BuildRequires: extra-cmake-modules >= 1.1.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.0.0 +Requires: extra-cmake-modules >= 1.1.0 Requires: pkgconfig(Qt5Core) >= 5.2.0 %description devel