From 3b61562ccd9ee9f5f11fb8280b0c9506c277c56bef9a7f762e958dc06014ecda Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 08:19:56 +0000 Subject: [PATCH 1/4] KDE Frameworks 5.33 - Automated change, please review OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kbookmarks?expand=0&rev=112 --- kbookmarks-5.32.0.tar.xz | 3 --- kbookmarks-5.33.0.tar.xz | 3 +++ kbookmarks.changes | 11 +++++++++++ kbookmarks.spec | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 kbookmarks-5.32.0.tar.xz create mode 100644 kbookmarks-5.33.0.tar.xz diff --git a/kbookmarks-5.32.0.tar.xz b/kbookmarks-5.32.0.tar.xz deleted file mode 100644 index eb9cb9d..0000000 --- a/kbookmarks-5.32.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ccce2d638445763a961542bff5dd666417485ac8b96bb9c32644b062f11400d -size 115944 diff --git a/kbookmarks-5.33.0.tar.xz b/kbookmarks-5.33.0.tar.xz new file mode 100644 index 0000000..b2a9a02 --- /dev/null +++ b/kbookmarks-5.33.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02358a9d11271cb6dec820a2dfaeb0d58d06cafa937a40425c14dffc978bcda0 +size 115924 diff --git a/kbookmarks.changes b/kbookmarks.changes index ee48a2f..5725242 100644 --- a/kbookmarks.changes +++ b/kbookmarks.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Apr 15 10:11:44 CEST 2017 - lbeltrame@kde.org + +- Update to 5.33.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.33.0.php +- Changes since 5.32.0: + * Upgrade ECM and KF5 version requirements for 5.33.0 release. + * Upgrade KF5 version to 5.33.0. + ------------------------------------------------------------------- Sun Mar 19 14:50:15 CET 2017 - lbeltrame@kde.org diff --git a/kbookmarks.spec b/kbookmarks.spec index 29a3030..7a39469 100644 --- a/kbookmarks.spec +++ b/kbookmarks.spec @@ -20,7 +20,7 @@ %define lname libKF5Bookmarks5 %define _tar_path 5.32 Name: kbookmarks -Version: 5.32.0 +Version: 5.33.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 From aa4bbe500ee6299e4c39b09ca0e28a2e495cdc7fa0ea9aee42c6914d01a7dfd1 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 09:49:24 +0000 Subject: [PATCH 2/4] Fix _tar_path version OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kbookmarks?expand=0&rev=113 --- kbookmarks.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kbookmarks.spec b/kbookmarks.spec index 7a39469..ca68e33 100644 --- a/kbookmarks.spec +++ b/kbookmarks.spec @@ -18,7 +18,7 @@ %bcond_without lang %define lname libKF5Bookmarks5 -%define _tar_path 5.32 +%define _tar_path 5.33 Name: kbookmarks Version: 5.33.0 Release: 0 From 8b653cdbae393d926184a19ad95f371a01fdcd0e4e4eb87bbb473a4f352e09ea Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 17 Apr 2017 16:13:21 +0000 Subject: [PATCH 3/4] Put _kf5_bugfix_version to ease maintenance instead of relying on _tar_path (port from KUF) OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kbookmarks?expand=0&rev=114 --- kbookmarks.spec | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/kbookmarks.spec b/kbookmarks.spec index ca68e33..954ad4a 100644 --- a/kbookmarks.spec +++ b/kbookmarks.spec @@ -18,22 +18,25 @@ %bcond_without lang %define lname libKF5Bookmarks5 -%define _tar_path 5.33 Name: kbookmarks Version: 5.33.0 Release: 0 +# 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} BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes -BuildRequires: kcodecs-devel >= %{_tar_path} -BuildRequires: kconfig-devel >= %{_tar_path} -BuildRequires: kconfigwidgets-devel >= %{_tar_path} -BuildRequires: kcoreaddons-devel >= %{_tar_path} +BuildRequires: kcodecs-devel >= %{_kf5_bugfix_version} +BuildRequires: kconfig-devel >= %{_kf5_bugfix_version} +BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} +BuildRequires: kcoreaddons-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: kiconthemes-devel >= %{_tar_path} -BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: kxmlgui-devel >= %{_tar_path} +BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version} +BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kxmlgui-devel >= %{_kf5_bugfix_version} %if %{with lang} BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 %endif @@ -44,7 +47,7 @@ Summary: Lets you access and manipulate bookmarks stored using XBEL forma License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,7 +69,7 @@ Summary: Lets you access and manipulate bookmarks stored using XBEL forma Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: kwidgetsaddons-devel >= %{_tar_path} +Requires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} Requires: cmake(Qt5Widgets) >= 5.6.0 Requires: cmake(Qt5Xml) >= 5.6.0 From 44e07b4a51152989b96b570d019bc6e2fd9539f29926da8a3efd1cf872a6f54b Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 27 Apr 2017 20:24:18 +0000 Subject: [PATCH 4/4] Revert to using _tar_path to fix Factory submission OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kbookmarks?expand=0&rev=115 --- kbookmarks.spec | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/kbookmarks.spec b/kbookmarks.spec index 954ad4a..ca68e33 100644 --- a/kbookmarks.spec +++ b/kbookmarks.spec @@ -18,25 +18,22 @@ %bcond_without lang %define lname libKF5Bookmarks5 +%define _tar_path 5.33 Name: kbookmarks Version: 5.33.0 Release: 0 -# 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} BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes -BuildRequires: kcodecs-devel >= %{_kf5_bugfix_version} -BuildRequires: kconfig-devel >= %{_kf5_bugfix_version} -BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} -BuildRequires: kcoreaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kcodecs-devel >= %{_tar_path} +BuildRequires: kconfig-devel >= %{_tar_path} +BuildRequires: kconfigwidgets-devel >= %{_tar_path} +BuildRequires: kcoreaddons-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: kiconthemes-devel >= %{_kf5_bugfix_version} -BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} -BuildRequires: kxmlgui-devel >= %{_kf5_bugfix_version} +BuildRequires: kiconthemes-devel >= %{_tar_path} +BuildRequires: kwidgetsaddons-devel >= %{_tar_path} +BuildRequires: kxmlgui-devel >= %{_tar_path} %if %{with lang} BuildRequires: cmake(Qt5LinguistTools) >= 5.6.0 %endif @@ -47,7 +44,7 @@ Summary: Lets you access and manipulate bookmarks stored using XBEL forma License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,7 +66,7 @@ Summary: Lets you access and manipulate bookmarks stored using XBEL forma Group: Development/Libraries/KDE Requires: %lname = %{version} Requires: extra-cmake-modules -Requires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} +Requires: kwidgetsaddons-devel >= %{_tar_path} Requires: cmake(Qt5Widgets) >= 5.6.0 Requires: cmake(Qt5Xml) >= 5.6.0