From f90413343a1a342bb9d1b75a454663899c3396dd9c453fc95165145f04031591 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 12 Sep 2017 18:58:05 +0000 Subject: [PATCH 1/2] KDE Frameworks 5.38.0 checkin OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdesignerplugin?expand=0&rev=129 --- kdesignerplugin-5.37.0.tar.xz | 3 --- kdesignerplugin-5.38.0.tar.xz | 3 +++ kdesignerplugin.changes | 10 ++++++++++ kdesignerplugin.spec | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 kdesignerplugin-5.37.0.tar.xz create mode 100644 kdesignerplugin-5.38.0.tar.xz diff --git a/kdesignerplugin-5.37.0.tar.xz b/kdesignerplugin-5.37.0.tar.xz deleted file mode 100644 index cc85c18..0000000 --- a/kdesignerplugin-5.37.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc691bf91e4ea15323be728bf47c3eb02905adc85a2967acd7b731bc06002785 -size 90656 diff --git a/kdesignerplugin-5.38.0.tar.xz b/kdesignerplugin-5.38.0.tar.xz new file mode 100644 index 0000000..5de95d3 --- /dev/null +++ b/kdesignerplugin-5.38.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6038ac44f05083e6d1e7e2d8b950b31d493f1bf587f4b89984fefae5f973b66 +size 90704 diff --git a/kdesignerplugin.changes b/kdesignerplugin.changes index 6dd67ce..ef1ab4a 100644 --- a/kdesignerplugin.changes +++ b/kdesignerplugin.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: + * None + ------------------------------------------------------------------- Sat Aug 12 09:23:23 UTC 2017 - christophe@krop.fr diff --git a/kdesignerplugin.spec b/kdesignerplugin.spec index bee302f..638e9a7 100644 --- a/kdesignerplugin.spec +++ b/kdesignerplugin.spec @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.37 +%define _tar_path 5.38 Name: kdesignerplugin -Version: 5.37.0 +Version: 5.38.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 From 12eab921eca64b64913fe7bf61692574b07a0b63d0972af0c218bd3aa437d077 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 13 Sep 2017 12:23:20 +0000 Subject: [PATCH 2/2] Changes for KF5-KUF syncing OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdesignerplugin?expand=0&rev=130 --- kdesignerplugin.spec | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/kdesignerplugin.spec b/kdesignerplugin.spec index 638e9a7..04f8e03 100644 --- a/kdesignerplugin.spec +++ b/kdesignerplugin.spec @@ -21,27 +21,30 @@ Name: kdesignerplugin Version: 5.38.0 Release: 0 -%define kf5_version %{version} +# 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}')} BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} -BuildRequires: kbookmarks-devel >= %{_tar_path} -BuildRequires: kcompletion-devel >= %{_tar_path} -BuildRequires: kconfigwidgets-devel >= %{_tar_path} -BuildRequires: kdbusaddons-devel >= %{_tar_path} -BuildRequires: kdewebkit-devel >= %{_tar_path} -BuildRequires: kdoctools-devel >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} +BuildRequires: kbookmarks-devel >= %{_kf5_bugfix_version} +BuildRequires: kcompletion-devel >= %{_kf5_bugfix_version} +BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} +BuildRequires: kdbusaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kdewebkit-devel >= %{_kf5_bugfix_version} +BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: kguiaddons-devel >= %{_tar_path} -BuildRequires: ki18n-devel >= %{_tar_path} -BuildRequires: kiconthemes-devel >= %{_tar_path} -BuildRequires: kio-devel >= %{_tar_path} -BuildRequires: kitemviews-devel >= %{_tar_path} -BuildRequires: kplotting-devel >= %{_tar_path} -BuildRequires: kservice-devel >= %{_tar_path} -BuildRequires: ktextwidgets-devel >= %{_tar_path} -BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: kwindowsystem-devel >= %{_tar_path} -BuildRequires: kxmlgui-devel >= %{_tar_path} +BuildRequires: kguiaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version} +BuildRequires: kio-devel >= %{_kf5_bugfix_version} +BuildRequires: kitemviews-devel >= %{_kf5_bugfix_version} +BuildRequires: kplotting-devel >= %{_kf5_bugfix_version} +BuildRequires: kservice-devel >= %{_kf5_bugfix_version} +BuildRequires: ktextwidgets-devel >= %{_kf5_bugfix_version} +BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} +BuildRequires: kxmlgui-devel >= %{_kf5_bugfix_version} %if %{with lang} BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 %endif