From c96e48bc395d83d4ca1c2a558313b6b0b113bded6fb310c45c380c111d63eadb Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 12 Sep 2017 18:56:55 +0000 Subject: [PATCH 1/3] KDE Frameworks 5.38.0 checkin OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities-stats?expand=0&rev=46 --- kactivities-stats-5.37.0.tar.xz | 3 --- kactivities-stats-5.38.0.tar.xz | 3 +++ kactivities-stats.changes | 13 +++++++++++++ kactivities-stats.spec | 4 ++-- 4 files changed, 18 insertions(+), 5 deletions(-) delete mode 100644 kactivities-stats-5.37.0.tar.xz create mode 100644 kactivities-stats-5.38.0.tar.xz diff --git a/kactivities-stats-5.37.0.tar.xz b/kactivities-stats-5.37.0.tar.xz deleted file mode 100644 index eccfc46..0000000 --- a/kactivities-stats-5.37.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c29764a863e69f065c75827980c127357708a88dbf8d7e38af54dd73dc6ffa27 -size 60600 diff --git a/kactivities-stats-5.38.0.tar.xz b/kactivities-stats-5.38.0.tar.xz new file mode 100644 index 0000000..4c8ccc4 --- /dev/null +++ b/kactivities-stats-5.38.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a23955ce584ea0a1be8fe17b0b9cad819279b7518d3a9cf175a40e4bc08fa768 +size 60828 diff --git a/kactivities-stats.changes b/kactivities-stats.changes index d14da06..43edc8d 100644 --- a/kactivities-stats.changes +++ b/kactivities-stats.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Sep 12 07:11:16 CEST 2017 - lbeltrame@kde.org + +- Update to 5.38.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.38.0.php +- Changes since 5.37.0: + * Refactor of the query which combines linked and used resources + * Switched debugging output off + * Reloading the model when the resource gets unlinked + * Fixed the query when merging linked and used resources + ------------------------------------------------------------------- Sat Aug 12 09:23:15 UTC 2017 - christophe@krop.fr diff --git a/kactivities-stats.spec b/kactivities-stats.spec index cbb6d59..cb391e5 100644 --- a/kactivities-stats.spec +++ b/kactivities-stats.spec @@ -17,9 +17,9 @@ %define lname libKF5ActivitiesStats1 -%define _tar_path 5.37 +%define _tar_path 5.38 Name: kactivities-stats -Version: 5.37.0 +Version: 5.38.0 Release: 0 %define kf5_version %{version} Summary: KDE Plasma Activities support From dcb2d2cff2c09674c22de9d8befe516bcd1dcc8ca9e6c507beb164fe4d69b5d0 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 13 Sep 2017 09:58:15 +0000 Subject: [PATCH 2/3] Changes for KUF-KF5 syncing OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities-stats?expand=0&rev=47 --- kactivities-stats.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/kactivities-stats.spec b/kactivities-stats.spec index cb391e5..5df1ef5 100644 --- a/kactivities-stats.spec +++ b/kactivities-stats.spec @@ -18,6 +18,11 @@ %define lname libKF5ActivitiesStats1 %define _tar_path 5.38 +# Full KF5 version (e.g. 5.33.0) +%{!?_kf5_version: %global _kf5_version %{version}} +# Last major and minor KF5 version (e.g. 5.33) +%{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} +%define kf5_version %{version} Name: kactivities-stats Version: 5.38.0 Release: 0 @@ -34,12 +39,12 @@ BuildRequires: libboost_headers-devel BuildRequires: boost-devel %endif BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: xz -BuildRequires: cmake(KF5Activities) >= %{_tar_path} -BuildRequires: cmake(KF5Config) >= %{_tar_path} +BuildRequires: cmake(KF5Activities) >= %{_kf5_bugfix_version} +BuildRequires: cmake(KF5Config) >= %{_kf5_bugfix_version} BuildRequires: cmake(Qt5Core) >= 5.3.0 BuildRequires: cmake(Qt5DBus) >= 5.3.0 BuildRequires: cmake(Qt5Sql) >= 5.3.0 From f93a72cf84cfd59feb18c2c8ea58db28cb1c92eb5fd2029b17d6828d336ff7a6 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 13 Sep 2017 09:59:28 +0000 Subject: [PATCH 3/3] Changes for KUF-KF5 syncing OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kactivities-stats?expand=0&rev=48 --- kactivities-stats.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/kactivities-stats.spec b/kactivities-stats.spec index 5df1ef5..6052fcc 100644 --- a/kactivities-stats.spec +++ b/kactivities-stats.spec @@ -22,11 +22,9 @@ %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} -%define kf5_version %{version} Name: kactivities-stats Version: 5.38.0 Release: 0 -%define kf5_version %{version} Summary: KDE Plasma Activities support License: LGPL-2.0+ Group: System/Libraries