From ee8b42e1723a8b32cabb7cd9927774ae09bb0fdcd71712a5fb8cc49ca6045a27 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 10:45:14 +0000 Subject: [PATCH 1/4] Update to 5.33.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=124 --- sonnet-5.32.0.tar.xz | 3 --- sonnet-5.33.0.tar.xz | 3 +++ sonnet.changes | 11 +++++++++++ sonnet.spec | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 sonnet-5.32.0.tar.xz create mode 100644 sonnet-5.33.0.tar.xz diff --git a/sonnet-5.32.0.tar.xz b/sonnet-5.32.0.tar.xz deleted file mode 100644 index 9db824d..0000000 --- a/sonnet-5.32.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d11f917327fbe31a1a9666c560b4c4b49e6b38a3d104afe97daefcb110d9529f -size 283204 diff --git a/sonnet-5.33.0.tar.xz b/sonnet-5.33.0.tar.xz new file mode 100644 index 0000000..f4083e5 --- /dev/null +++ b/sonnet-5.33.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d8f6baf9b4c44bec3e61e3d64a70a522c2f7ab2965a72e85ebef45c925bde24 +size 283252 diff --git a/sonnet.changes b/sonnet.changes index fa3d891..9d0f58e 100644 --- a/sonnet.changes +++ b/sonnet.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Apr 15 10:11:59 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:51:17 CET 2017 - lbeltrame@kde.org diff --git a/sonnet.spec b/sonnet.spec index 0d30261..f25a21e 100644 --- a/sonnet.spec +++ b/sonnet.spec @@ -20,7 +20,7 @@ %define sonum 5 %define _tar_path 5.32 Name: sonnet -Version: 5.32.0 +Version: 5.33.0 Release: 0 #BuildRequires: aspell-devel BuildRequires: cmake >= 3.0 From afca81fc94dff2790ecd2bbf219c0b15989304413c56cf19b48a81698e26b1ce Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 15 Apr 2017 10:46:18 +0000 Subject: [PATCH 2/4] Fix tar_path OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=125 --- sonnet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonnet.spec b/sonnet.spec index f25a21e..1bb6b37 100644 --- a/sonnet.spec +++ b/sonnet.spec @@ -18,7 +18,7 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.32 +%define _tar_path 5.33 Name: sonnet Version: 5.33.0 Release: 0 From c74d8f654b4798c821eea1a86ddda50217c749bc399d555be9262c3b36a327e6 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Mon, 17 Apr 2017 16:15:48 +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/sonnet?expand=0&rev=126 --- sonnet.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sonnet.spec b/sonnet.spec index 1bb6b37..012ff8e 100644 --- a/sonnet.spec +++ b/sonnet.spec @@ -18,15 +18,18 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.33 Name: sonnet 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: aspell-devel BuildRequires: cmake >= 3.0 # Enchant plugin is currently disabled upstream #BuildRequires: enchant-devel -BuildRequires: extra-cmake-modules >= %{_tar_path} +BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem %if %{with lang} @@ -41,7 +44,7 @@ Summary: KDE spell checking library 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 de5f4ee389684637ced8e2946fab5b08c6f3a5c18b9057ffd8fbdc8f8bdbebe9 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Thu, 27 Apr 2017 20:26: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/sonnet?expand=0&rev=127 --- sonnet.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sonnet.spec b/sonnet.spec index 012ff8e..1bb6b37 100644 --- a/sonnet.spec +++ b/sonnet.spec @@ -18,18 +18,15 @@ %bcond_without lang %define sonum 5 +%define _tar_path 5.33 Name: sonnet 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: aspell-devel BuildRequires: cmake >= 3.0 # Enchant plugin is currently disabled upstream #BuildRequires: enchant-devel -BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} +BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kf5-filesystem %if %{with lang} @@ -44,7 +41,7 @@ Summary: KDE spell checking library 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