From fdf3b74f1cd5389535ac9d3a826ec3797bb7ffa0311a9f272b2c996ea5758356 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 08:22:36 +0000 Subject: [PATCH 1/4] KDE Frameworks 5.33 - Automated change, please review OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kimageformats?expand=0&rev=111 --- kimageformats-5.32.0.tar.xz | 3 --- kimageformats-5.33.0.tar.xz | 3 +++ kimageformats.changes | 10 ++++++++++ kimageformats.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 kimageformats-5.32.0.tar.xz create mode 100644 kimageformats-5.33.0.tar.xz diff --git a/kimageformats-5.32.0.tar.xz b/kimageformats-5.32.0.tar.xz deleted file mode 100644 index 594a0f0..0000000 --- a/kimageformats-5.32.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7fbbb25aa1c1da8ba92c9cfd14f07eee85698e4306c409062b320fa689451616 -size 204588 diff --git a/kimageformats-5.33.0.tar.xz b/kimageformats-5.33.0.tar.xz new file mode 100644 index 0000000..8db9346 --- /dev/null +++ b/kimageformats-5.33.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea11ecf13135a2bd9ff179ccb8a7691695621b2356925bd150eeb0bc6f282dd5 +size 204632 diff --git a/kimageformats.changes b/kimageformats.changes index 6974249..9abe8cf 100644 --- a/kimageformats.changes +++ b/kimageformats.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Sun Mar 19 14:50:39 CET 2017 - lbeltrame@kde.org diff --git a/kimageformats.spec b/kimageformats.spec index dd2b427..ad8006b 100644 --- a/kimageformats.spec +++ b/kimageformats.spec @@ -18,7 +18,7 @@ %define _tar_path 5.32 Name: kimageformats -Version: 5.32.0 +Version: 5.33.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} From 3d68dcfa245ef550c20d62e1e9a255dadb49735629003fd33bbabf256039dc86 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 09:50:53 +0000 Subject: [PATCH 2/4] Fix _tar_path version OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kimageformats?expand=0&rev=112 --- kimageformats.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kimageformats.spec b/kimageformats.spec index ad8006b..34b3d5e 100644 --- a/kimageformats.spec +++ b/kimageformats.spec @@ -16,7 +16,7 @@ # -%define _tar_path 5.32 +%define _tar_path 5.33 Name: kimageformats Version: 5.33.0 Release: 0 From 0a070216357d2f8ff1a5c7cf3c0fe849b581bd7d37a006856f7775986aeb753e Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 17 Apr 2017 16:14: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/kimageformats?expand=0&rev=113 --- kimageformats.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/kimageformats.spec b/kimageformats.spec index 34b3d5e..3406be2 100644 --- a/kimageformats.spec +++ b/kimageformats.spec @@ -16,17 +16,20 @@ # -%define _tar_path 5.33 Name: kimageformats 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}')} BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: openexr BuildRequires: openexr-devel -BuildRequires: cmake(KF5Archive) >= %{_tar_path} +BuildRequires: cmake(KF5Archive) >= %{_kf5_bugfix_version} BuildRequires: cmake(Qt5Gui) >= 5.6.0 BuildRequires: cmake(Qt5PrintSupport) >= 5.6.0 BuildRequires: cmake(Qt5Test) >= 5.6.0 @@ -37,7 +40,7 @@ Summary: Image format plugins for Qt 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 From 88354bf1476e97190d7f541e4f3a7a37d2e507e694bcf1cee79695223f934915 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 27 Apr 2017 20:25: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/kimageformats?expand=0&rev=114 --- kimageformats.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/kimageformats.spec b/kimageformats.spec index 3406be2..34b3d5e 100644 --- a/kimageformats.spec +++ b/kimageformats.spec @@ -16,20 +16,17 @@ # +%define _tar_path 5.33 Name: kimageformats 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}')} BuildRequires: cmake >= 3.0 -BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: openexr BuildRequires: openexr-devel -BuildRequires: cmake(KF5Archive) >= %{_kf5_bugfix_version} +BuildRequires: cmake(KF5Archive) >= %{_tar_path} BuildRequires: cmake(Qt5Gui) >= 5.6.0 BuildRequires: cmake(Qt5PrintSupport) >= 5.6.0 BuildRequires: cmake(Qt5Test) >= 5.6.0 @@ -40,7 +37,7 @@ Summary: Image format plugins for Qt 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