From 65ee6e690ea48f1674d4dc5203dd0b41499454a0251d54c2f0ce8c281f862ab0 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 08:22:41 +0000 Subject: [PATCH 1/4] KDE Frameworks 5.33 - Automated change, please review OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinit?expand=0&rev=128 --- kinit-5.32.0.tar.xz | 3 --- kinit-5.33.0.tar.xz | 3 +++ kinit.changes | 11 +++++++++++ kinit.spec | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 kinit-5.32.0.tar.xz create mode 100644 kinit-5.33.0.tar.xz diff --git a/kinit-5.32.0.tar.xz b/kinit-5.32.0.tar.xz deleted file mode 100644 index 0aa00ab..0000000 --- a/kinit-5.32.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16d3ab12743cd576ae33be4e8b4b3d0925ac3e4546e3d8132d85b77ba9a30304 -size 120616 diff --git a/kinit-5.33.0.tar.xz b/kinit-5.33.0.tar.xz new file mode 100644 index 0000000..aa32bf9 --- /dev/null +++ b/kinit-5.33.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:577a32af7fde800ee1b9838ad56685f814b1c216191963ab4d8fe312d7636d6c +size 120568 diff --git a/kinit.changes b/kinit.changes index 28d4294..f28880b 100644 --- a/kinit.changes +++ b/kinit.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Apr 15 10:11:50 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:39 CET 2017 - lbeltrame@kde.org diff --git a/kinit.spec b/kinit.spec index a103216..d95f128 100644 --- a/kinit.spec +++ b/kinit.spec @@ -19,7 +19,7 @@ %bcond_without lang %define _tar_path 5.32 Name: kinit -Version: 5.32.0 +Version: 5.33.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 From 4d5803aaecc9be746bb095bf0c13e0d7f7ad31f5168c092a3bd993f419435972 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 09:50:57 +0000 Subject: [PATCH 2/4] Fix _tar_path version OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinit?expand=0&rev=129 --- kinit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kinit.spec b/kinit.spec index d95f128..7c2c3fb 100644 --- a/kinit.spec +++ b/kinit.spec @@ -17,7 +17,7 @@ %bcond_without lang -%define _tar_path 5.32 +%define _tar_path 5.33 Name: kinit Version: 5.33.0 Release: 0 From efcb43dd522c8cc38a3fb5c61074f52e5c5a9243eb12e60a4c5c69c0aa1c01b3 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 17 Apr 2017 16:14:24 +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/kinit?expand=0&rev=130 --- kinit.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/kinit.spec b/kinit.spec index 7c2c3fb..3b5f822 100644 --- a/kinit.spec +++ b/kinit.spec @@ -17,21 +17,24 @@ %bcond_without lang -%define _tar_path 5.33 Name: kinit 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: kcrash-devel >= %{_tar_path} -BuildRequires: kdoctools-devel >= %{_tar_path} +BuildRequires: kcrash-devel >= %{_kf5_bugfix_version} +BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_tar_path} -BuildRequires: kio-devel >= %{_tar_path} -BuildRequires: kservice-devel >= %{_tar_path} -BuildRequires: kwindowsystem-devel >= %{_tar_path} +BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} +BuildRequires: kio-devel >= %{_kf5_bugfix_version} +BuildRequires: kservice-devel >= %{_kf5_bugfix_version} +BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} BuildRequires: libcap-devel BuildRequires: libcap-progs BuildRequires: cmake(Qt5Core) >= 5.6.0 @@ -47,7 +50,7 @@ Summary: Helper library to speed up start of applications on KDE workspac 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 # PATCH-FIX-OPENSUSE fpie.patch -- add -(f)pie link flags to start_kdeinit target Patch0: fpie.patch From 7ecc3283ac8c90dda2cfdbc8feecb930631dc9f583e815b32887e5ab409b194d Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 27 Apr 2017 20:25:20 +0000 Subject: [PATCH 4/4] Revert to using _tar_path to fix Factory submission OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kinit?expand=0&rev=131 --- kinit.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/kinit.spec b/kinit.spec index 3b5f822..7c2c3fb 100644 --- a/kinit.spec +++ b/kinit.spec @@ -17,24 +17,21 @@ %bcond_without lang +%define _tar_path 5.33 Name: kinit 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: kcrash-devel >= %{_kf5_bugfix_version} -BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} +BuildRequires: kcrash-devel >= %{_tar_path} +BuildRequires: kdoctools-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: ki18n-devel >= %{_kf5_bugfix_version} -BuildRequires: kio-devel >= %{_kf5_bugfix_version} -BuildRequires: kservice-devel >= %{_kf5_bugfix_version} -BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} +BuildRequires: ki18n-devel >= %{_tar_path} +BuildRequires: kio-devel >= %{_tar_path} +BuildRequires: kservice-devel >= %{_tar_path} +BuildRequires: kwindowsystem-devel >= %{_tar_path} BuildRequires: libcap-devel BuildRequires: libcap-progs BuildRequires: cmake(Qt5Core) >= 5.6.0 @@ -50,7 +47,7 @@ Summary: Helper library to speed up start of applications on KDE workspac 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 # PATCH-FIX-OPENSUSE fpie.patch -- add -(f)pie link flags to start_kdeinit target Patch0: fpie.patch