From d7e954c1fc2ff036d4dfc8173b43d4c681ac52e674dfedac3b562a1d6117fd92 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 12 Sep 2017 18:57:11 +0000 Subject: [PATCH 1/2] KDE Frameworks 5.38.0 checkin OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kbookmarks?expand=0&rev=126 --- kbookmarks-5.37.0.tar.xz | 3 --- kbookmarks-5.38.0.tar.xz | 3 +++ kbookmarks.changes | 10 ++++++++++ kbookmarks.spec | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) delete mode 100644 kbookmarks-5.37.0.tar.xz create mode 100644 kbookmarks-5.38.0.tar.xz diff --git a/kbookmarks-5.37.0.tar.xz b/kbookmarks-5.37.0.tar.xz deleted file mode 100644 index e14bebd..0000000 --- a/kbookmarks-5.37.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:815843ae3c6e8f36e1ea31aa9750dfa1b18be86c415edfcce362c2b3809cd950 -size 117256 diff --git a/kbookmarks-5.38.0.tar.xz b/kbookmarks-5.38.0.tar.xz new file mode 100644 index 0000000..b32ce50 --- /dev/null +++ b/kbookmarks-5.38.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38af8bb592a323b05d05b72d22b9bd5d48932a01e86941fec5e0e5ca59054368 +size 117280 diff --git a/kbookmarks.changes b/kbookmarks.changes index c02c31e..1f2f3d5 100644 --- a/kbookmarks.changes +++ b/kbookmarks.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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: + * Do not leak symbols of pimpl classes, protect with Q_DECL_HIDDEN + ------------------------------------------------------------------- Sat Aug 12 09:23:17 UTC 2017 - christophe@krop.fr diff --git a/kbookmarks.spec b/kbookmarks.spec index 601ad83..00a2eaf 100644 --- a/kbookmarks.spec +++ b/kbookmarks.spec @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Bookmarks5 -%define _tar_path 5.37 +%define _tar_path 5.38 Name: kbookmarks -Version: 5.37.0 +Version: 5.38.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 From aa92ddc1ee4725bc451f01c515b9997d3cb4b5e7deda5b1ef9d8fe91730d81ee Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Wed, 13 Sep 2017 10:20:05 +0000 Subject: [PATCH 2/2] Changes for KF5-KUF syncing OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kbookmarks?expand=0&rev=127 --- kbookmarks.spec | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/kbookmarks.spec b/kbookmarks.spec index 00a2eaf..7e93867 100644 --- a/kbookmarks.spec +++ b/kbookmarks.spec @@ -19,21 +19,25 @@ %bcond_without lang %define lname libKF5Bookmarks5 %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: kbookmarks 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: 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 @@ -66,7 +70,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