From aadb4cc99cb204fa148a6f47585921e70c80004daab3b723553963f461999823 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 08:21:05 +0000 Subject: [PATCH 1/4] KDE Frameworks 5.33 - Automated change, please review OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdelibs4support?expand=0&rev=135 --- kdelibs4support-5.32.0.tar.xz | 3 --- kdelibs4support-5.33.0.tar.xz | 3 +++ kdelibs4support.changes | 11 +++++++++++ kdelibs4support.spec | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 kdelibs4support-5.32.0.tar.xz create mode 100644 kdelibs4support-5.33.0.tar.xz diff --git a/kdelibs4support-5.32.0.tar.xz b/kdelibs4support-5.32.0.tar.xz deleted file mode 100644 index 7b3a0fd..0000000 --- a/kdelibs4support-5.32.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eba61d876c37249d089f423f144246cd64908e3da84929f9e619c25c9a2a56f1 -size 3344040 diff --git a/kdelibs4support-5.33.0.tar.xz b/kdelibs4support-5.33.0.tar.xz new file mode 100644 index 0000000..82fa02b --- /dev/null +++ b/kdelibs4support-5.33.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6917ef2269cbf8cf742d02a61fba02b04064a624e20b4fcc714a5a3cc9dddebf +size 3343568 diff --git a/kdelibs4support.changes b/kdelibs4support.changes index 8aad09e..d4de98d 100644 --- a/kdelibs4support.changes +++ b/kdelibs4support.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Apr 15 10:11:47 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. + ------------------------------------------------------------------- Fri Apr 7 11:16:04 UTC 2017 - wbauer@tmo.at diff --git a/kdelibs4support.spec b/kdelibs4support.spec index 10bd183..7e97dda 100644 --- a/kdelibs4support.spec +++ b/kdelibs4support.spec @@ -20,7 +20,7 @@ %define lname libKF5KDELibs4Support5 %define _tar_path 5.32 Name: kdelibs4support -Version: 5.32.0 +Version: 5.33.0 Release: 0 %define kf5_version %{version} BuildRequires: NetworkManager-devel From dad748588b9c62496a3c4c0fd327aea62d912f49299735c174dc4e08818e98be Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 09:50:01 +0000 Subject: [PATCH 2/4] Fix _tar_path version OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdelibs4support?expand=0&rev=136 --- kdelibs4support.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdelibs4support.spec b/kdelibs4support.spec index 7e97dda..a4b57dc 100644 --- a/kdelibs4support.spec +++ b/kdelibs4support.spec @@ -18,7 +18,7 @@ %bcond_without lang %define lname libKF5KDELibs4Support5 -%define _tar_path 5.32 +%define _tar_path 5.33 Name: kdelibs4support Version: 5.33.0 Release: 0 From 4e1fb1b9b10147e22559014fc7ddfa906c6b5a803733a0671eb93a4ea98082ab Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 17 Apr 2017 16:13:49 +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/kdelibs4support?expand=0&rev=138 --- kdelibs4support.spec | 93 +++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 45 deletions(-) diff --git a/kdelibs4support.spec b/kdelibs4support.spec index a4b57dc..528c437 100644 --- a/kdelibs4support.spec +++ b/kdelibs4support.spec @@ -18,39 +18,42 @@ %bcond_without lang %define lname libKF5KDELibs4Support5 -%define _tar_path 5.33 Name: kdelibs4support 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: NetworkManager-devel BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes -BuildRequires: kbookmarks-devel >= %{_tar_path} -BuildRequires: kcompletion-devel >= %{_tar_path} -BuildRequires: kconfig-devel >= %{_tar_path} -BuildRequires: kconfigwidgets-devel >= %{_tar_path} -BuildRequires: kcrash-devel >= %{_tar_path} -BuildRequires: kdbusaddons-devel >= %{_tar_path} -BuildRequires: kded-devel >= %{_tar_path} -BuildRequires: kdesignerplugin-devel >= %{_tar_path} -BuildRequires: kdoctools-devel >= %{_tar_path} +BuildRequires: kbookmarks-devel >= %{_kf5_bugfix_version} +BuildRequires: kcompletion-devel >= %{_kf5_bugfix_version} +BuildRequires: kconfig-devel >= %{_kf5_bugfix_version} +BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} +BuildRequires: kcrash-devel >= %{_kf5_bugfix_version} +BuildRequires: kdbusaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kded-devel >= %{_kf5_bugfix_version} +BuildRequires: kdesignerplugin-devel >= %{_kf5_bugfix_version} +BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} BuildRequires: kf5-filesystem -BuildRequires: kglobalaccel-devel >= %{_tar_path} -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: knotifications-devel >= %{_tar_path} -BuildRequires: kparts-devel >= %{_tar_path} -BuildRequires: kservice-devel >= %{_tar_path} -BuildRequires: ktextwidgets-devel >= %{_tar_path} -BuildRequires: kunitconversion-devel >= %{_tar_path} -BuildRequires: kwidgetsaddons-devel >= %{_tar_path} -BuildRequires: kwindowsystem-devel >= %{_tar_path} -BuildRequires: kxmlgui-devel >= %{_tar_path} +BuildRequires: kglobalaccel-devel >= %{_kf5_bugfix_version} +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: knotifications-devel >= %{_kf5_bugfix_version} +BuildRequires: kparts-devel >= %{_kf5_bugfix_version} +BuildRequires: kservice-devel >= %{_kf5_bugfix_version} +BuildRequires: ktextwidgets-devel >= %{_kf5_bugfix_version} +BuildRequires: kunitconversion-devel >= %{_kf5_bugfix_version} +BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} +BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} +BuildRequires: kxmlgui-devel >= %{_kf5_bugfix_version} BuildRequires: perl-URI BuildRequires: cmake(Qt5Concurrent) >= 5.6.0 BuildRequires: cmake(Qt5Core) >= 5.6.0 @@ -74,7 +77,7 @@ Summary: Code and utilities to ease the transition to KDE Frameworks 5 License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{_tar_path}/portingAids/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/portingAids/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -119,7 +122,7 @@ KDEDIRS environment variable correctly. Summary: Code and utilities to ease the transition to KDE Frameworks 5 License: LGPL-2.1+ Group: System/GUI/KDE -Requires: kded >= %{_tar_path} +Requires: kded >= %{_kf5_bugfix_version} %description -n %lname This package includes CMake macros and C++ @@ -146,24 +149,24 @@ Requires: %{name} = %{version} Provides: kde4support-devel = %{version} Obsoletes: kde4support-devel < %{version} Requires: extra-cmake-modules -Requires: karchive-devel >= %{_tar_path} -Requires: kauth-devel >= %{_tar_path} -Requires: kconfigwidgets-devel >= %{_tar_path} -Requires: kcoreaddons-devel >= %{_tar_path} -Requires: kcrash-devel >= %{_tar_path} -Requires: kdbusaddons-devel >= %{_tar_path} -Requires: kdesignerplugin-devel >= %{_tar_path} -Requires: kdoctools-devel >= %{_tar_path} -Requires: kemoticons-devel >= %{_tar_path} -Requires: kguiaddons-devel >= %{_tar_path} -Requires: kiconthemes-devel >= %{_tar_path} -Requires: kinit-devel >= %{_tar_path} -Requires: kitemmodels-devel >= %{_tar_path} -Requires: knotifications-devel >= %{_tar_path} -Requires: kparts-devel >= %{_tar_path} -Requires: ktextwidgets-devel >= %{_tar_path} -Requires: kunitconversion-devel >= %{_tar_path} -Requires: kwindowsystem-devel >= %{_tar_path} +Requires: karchive-devel >= %{_kf5_bugfix_version} +Requires: kauth-devel >= %{_kf5_bugfix_version} +Requires: kconfigwidgets-devel >= %{_kf5_bugfix_version} +Requires: kcoreaddons-devel >= %{_kf5_bugfix_version} +Requires: kcrash-devel >= %{_kf5_bugfix_version} +Requires: kdbusaddons-devel >= %{_kf5_bugfix_version} +Requires: kdesignerplugin-devel >= %{_kf5_bugfix_version} +Requires: kdoctools-devel >= %{_kf5_bugfix_version} +Requires: kemoticons-devel >= %{_kf5_bugfix_version} +Requires: kguiaddons-devel >= %{_kf5_bugfix_version} +Requires: kiconthemes-devel >= %{_kf5_bugfix_version} +Requires: kinit-devel >= %{_kf5_bugfix_version} +Requires: kitemmodels-devel >= %{_kf5_bugfix_version} +Requires: knotifications-devel >= %{_kf5_bugfix_version} +Requires: kparts-devel >= %{_kf5_bugfix_version} +Requires: ktextwidgets-devel >= %{_kf5_bugfix_version} +Requires: kunitconversion-devel >= %{_kf5_bugfix_version} +Requires: kwindowsystem-devel >= %{_kf5_bugfix_version} Requires: cmake(Qt5Core) >= 5.6.0 Requires: cmake(Qt5DBus) >= 5.6.0 Requires: cmake(Qt5PrintSupport) >= 5.6.0 From c44cfb63d50685f78743b72043916b828e46b2145a22f865fb8915fcca1773c0 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 27 Apr 2017 20:24:44 +0000 Subject: [PATCH 4/4] Revert to using _tar_path to fix Factory submission OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kdelibs4support?expand=0&rev=139 --- kdelibs4support.spec | 93 +++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 48 deletions(-) diff --git a/kdelibs4support.spec b/kdelibs4support.spec index 528c437..a4b57dc 100644 --- a/kdelibs4support.spec +++ b/kdelibs4support.spec @@ -18,42 +18,39 @@ %bcond_without lang %define lname libKF5KDELibs4Support5 +%define _tar_path 5.33 Name: kdelibs4support 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: NetworkManager-devel BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes -BuildRequires: kbookmarks-devel >= %{_kf5_bugfix_version} -BuildRequires: kcompletion-devel >= %{_kf5_bugfix_version} -BuildRequires: kconfig-devel >= %{_kf5_bugfix_version} -BuildRequires: kconfigwidgets-devel >= %{_kf5_bugfix_version} -BuildRequires: kcrash-devel >= %{_kf5_bugfix_version} -BuildRequires: kdbusaddons-devel >= %{_kf5_bugfix_version} -BuildRequires: kded-devel >= %{_kf5_bugfix_version} -BuildRequires: kdesignerplugin-devel >= %{_kf5_bugfix_version} -BuildRequires: kdoctools-devel >= %{_kf5_bugfix_version} +BuildRequires: kbookmarks-devel >= %{_tar_path} +BuildRequires: kcompletion-devel >= %{_tar_path} +BuildRequires: kconfig-devel >= %{_tar_path} +BuildRequires: kconfigwidgets-devel >= %{_tar_path} +BuildRequires: kcrash-devel >= %{_tar_path} +BuildRequires: kdbusaddons-devel >= %{_tar_path} +BuildRequires: kded-devel >= %{_tar_path} +BuildRequires: kdesignerplugin-devel >= %{_tar_path} +BuildRequires: kdoctools-devel >= %{_tar_path} BuildRequires: kf5-filesystem -BuildRequires: kglobalaccel-devel >= %{_kf5_bugfix_version} -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: knotifications-devel >= %{_kf5_bugfix_version} -BuildRequires: kparts-devel >= %{_kf5_bugfix_version} -BuildRequires: kservice-devel >= %{_kf5_bugfix_version} -BuildRequires: ktextwidgets-devel >= %{_kf5_bugfix_version} -BuildRequires: kunitconversion-devel >= %{_kf5_bugfix_version} -BuildRequires: kwidgetsaddons-devel >= %{_kf5_bugfix_version} -BuildRequires: kwindowsystem-devel >= %{_kf5_bugfix_version} -BuildRequires: kxmlgui-devel >= %{_kf5_bugfix_version} +BuildRequires: kglobalaccel-devel >= %{_tar_path} +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: knotifications-devel >= %{_tar_path} +BuildRequires: kparts-devel >= %{_tar_path} +BuildRequires: kservice-devel >= %{_tar_path} +BuildRequires: ktextwidgets-devel >= %{_tar_path} +BuildRequires: kunitconversion-devel >= %{_tar_path} +BuildRequires: kwidgetsaddons-devel >= %{_tar_path} +BuildRequires: kwindowsystem-devel >= %{_tar_path} +BuildRequires: kxmlgui-devel >= %{_tar_path} BuildRequires: perl-URI BuildRequires: cmake(Qt5Concurrent) >= 5.6.0 BuildRequires: cmake(Qt5Core) >= 5.6.0 @@ -77,7 +74,7 @@ Summary: Code and utilities to ease the transition to KDE Frameworks 5 License: LGPL-2.1+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/frameworks/%{_kf5_bugfix_version}/portingAids/%{name}-%{version}.tar.xz +Source: http://download.kde.org/stable/frameworks/%{_tar_path}/portingAids/%{name}-%{version}.tar.xz Source1: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -122,7 +119,7 @@ KDEDIRS environment variable correctly. Summary: Code and utilities to ease the transition to KDE Frameworks 5 License: LGPL-2.1+ Group: System/GUI/KDE -Requires: kded >= %{_kf5_bugfix_version} +Requires: kded >= %{_tar_path} %description -n %lname This package includes CMake macros and C++ @@ -149,24 +146,24 @@ Requires: %{name} = %{version} Provides: kde4support-devel = %{version} Obsoletes: kde4support-devel < %{version} Requires: extra-cmake-modules -Requires: karchive-devel >= %{_kf5_bugfix_version} -Requires: kauth-devel >= %{_kf5_bugfix_version} -Requires: kconfigwidgets-devel >= %{_kf5_bugfix_version} -Requires: kcoreaddons-devel >= %{_kf5_bugfix_version} -Requires: kcrash-devel >= %{_kf5_bugfix_version} -Requires: kdbusaddons-devel >= %{_kf5_bugfix_version} -Requires: kdesignerplugin-devel >= %{_kf5_bugfix_version} -Requires: kdoctools-devel >= %{_kf5_bugfix_version} -Requires: kemoticons-devel >= %{_kf5_bugfix_version} -Requires: kguiaddons-devel >= %{_kf5_bugfix_version} -Requires: kiconthemes-devel >= %{_kf5_bugfix_version} -Requires: kinit-devel >= %{_kf5_bugfix_version} -Requires: kitemmodels-devel >= %{_kf5_bugfix_version} -Requires: knotifications-devel >= %{_kf5_bugfix_version} -Requires: kparts-devel >= %{_kf5_bugfix_version} -Requires: ktextwidgets-devel >= %{_kf5_bugfix_version} -Requires: kunitconversion-devel >= %{_kf5_bugfix_version} -Requires: kwindowsystem-devel >= %{_kf5_bugfix_version} +Requires: karchive-devel >= %{_tar_path} +Requires: kauth-devel >= %{_tar_path} +Requires: kconfigwidgets-devel >= %{_tar_path} +Requires: kcoreaddons-devel >= %{_tar_path} +Requires: kcrash-devel >= %{_tar_path} +Requires: kdbusaddons-devel >= %{_tar_path} +Requires: kdesignerplugin-devel >= %{_tar_path} +Requires: kdoctools-devel >= %{_tar_path} +Requires: kemoticons-devel >= %{_tar_path} +Requires: kguiaddons-devel >= %{_tar_path} +Requires: kiconthemes-devel >= %{_tar_path} +Requires: kinit-devel >= %{_tar_path} +Requires: kitemmodels-devel >= %{_tar_path} +Requires: knotifications-devel >= %{_tar_path} +Requires: kparts-devel >= %{_tar_path} +Requires: ktextwidgets-devel >= %{_tar_path} +Requires: kunitconversion-devel >= %{_tar_path} +Requires: kwindowsystem-devel >= %{_tar_path} Requires: cmake(Qt5Core) >= 5.6.0 Requires: cmake(Qt5DBus) >= 5.6.0 Requires: cmake(Qt5PrintSupport) >= 5.6.0