From fd99bd91f871b1c669742e0d91a6f7551fc2a1c70897afefc4e06f61a7393d2d Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 12 Sep 2017 18:57:55 +0000 Subject: [PATCH 1/2] KDE Frameworks 5.38.0 checkin OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kded?expand=0&rev=128 --- kded-5.37.0.tar.xz | 3 --- kded-5.38.0.tar.xz | 3 +++ kded.changes | 10 ++++++++++ kded.spec | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 kded-5.37.0.tar.xz create mode 100644 kded-5.38.0.tar.xz diff --git a/kded-5.37.0.tar.xz b/kded-5.37.0.tar.xz deleted file mode 100644 index 8e15d3b..0000000 --- a/kded-5.37.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fea1c5e9fb1444be0988455c1e51fb2a8cc846db522297108a0b2c2c3a2e5a98 -size 38020 diff --git a/kded-5.38.0.tar.xz b/kded-5.38.0.tar.xz new file mode 100644 index 0000000..75e2f58 --- /dev/null +++ b/kded-5.38.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b96b50313783b5edcf5bb8a0bc4873a844cb1ca662feb0ace9a932e8bfc5277 +size 38112 diff --git a/kded.changes b/kded.changes index dc5ba15..070545d 100644 --- a/kded.changes +++ b/kded.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Sep 12 07:11:17 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: + * support X-KDE-OnlyShowOnQtPlatforms + ------------------------------------------------------------------- Sat Aug 12 09:23:22 UTC 2017 - christophe@krop.fr diff --git a/kded.spec b/kded.spec index a955bb7..fe02ae8 100644 --- a/kded.spec +++ b/kded.spec @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.37 +%define _tar_path 5.38 Name: kded -Version: 5.37.0 +Version: 5.38.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 From e8e457e5dc97b950fa2a5166fb46734b6c3a5cf43d65e050562625ade6d92e56 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 13 Sep 2017 12:21:01 +0000 Subject: [PATCH 2/2] Changes for KF5-KUF syncing OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kded?expand=0&rev=129 --- kded.spec | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/kded.spec b/kded.spec index fe02ae8..ef330d9 100644 --- a/kded.spec +++ b/kded.spec @@ -18,22 +18,26 @@ %bcond_without lang %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}')} Name: kded Version: 5.38.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes -BuildRequires: kcoreaddons-devel >= %{_tar_path} -BuildRequires: kcrash-devel >= %{_tar_path} -BuildRequires: kdbusaddons-devel >= %{_tar_path} -BuildRequires: kdoctools-devel >= %{_tar_path} +BuildRequires: kcoreaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kcrash-devel >= %{_kf5_bugfix_version} +BuildRequires: kdbusaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_tar_path} -BuildRequires: kinit-devel >= %{_tar_path} -BuildRequires: kservice-devel >= %{_tar_path} -BuildRequires: kwindowsystem-devel >= %{_tar_path} +BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: kinit-devel >= %{_kf5_bugfix_version} +BuildRequires: kservice-devel >= %{_kf5_bugfix_version} +BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} BuildRequires: cmake(Qt5Core) >= 5.6.0 BuildRequires: cmake(Qt5DBus) >= 5.6.0 BuildRequires: cmake(Qt5Network) >= 5.6.0