From e4ee85827d6bbdf1a09528539ef2656b36fe77929dc42935e66669aa95fb1349 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 9 Jan 2017 00:00:50 +0000 Subject: [PATCH 1/5] start with 5.30.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=115 --- sonnet-5.29.0.tar.xz | 3 --- sonnet-5.30.0.tar.xz | 3 +++ sonnet.changes | 7 +++++++ sonnet.spec | 9 +++------ 4 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 sonnet-5.29.0.tar.xz create mode 100644 sonnet-5.30.0.tar.xz diff --git a/sonnet-5.29.0.tar.xz b/sonnet-5.29.0.tar.xz deleted file mode 100644 index a28615e..0000000 --- a/sonnet-5.29.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20358de0d45387f44260c3e6f8df012d661b4446293cbb3823c978e3a8766965 -size 2652812 diff --git a/sonnet-5.30.0.tar.xz b/sonnet-5.30.0.tar.xz new file mode 100644 index 0000000..04b6b54 --- /dev/null +++ b/sonnet-5.30.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99fd42d919d3350e22ae99fc480a14bc30ebd461b064ef24aed5042c772a91c4 +size 281828 diff --git a/sonnet.changes b/sonnet.changes index 99e45cd..86d5d3e 100644 --- a/sonnet.changes +++ b/sonnet.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 9 00:00:45 UTC 2017 - hrvoje.senjan@gmail.com + +- Update to 5.30.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.30.0.php + ------------------------------------------------------------------- Sun Jan 8 16:57:22 UTC 2017 - hrvoje.senjan@gmail.com diff --git a/sonnet.spec b/sonnet.spec index c2e63a2..3dcfbdf 100644 --- a/sonnet.spec +++ b/sonnet.spec @@ -18,12 +18,12 @@ %bcond_without lang %define sonum 5 -%define _tar_path 5.29 +%define _tar_path 5.30 Name: sonnet -Version: 5.29.0 +Version: 5.30.0 Release: 0 #BuildRequires: aspell-devel -BuildRequires: cmake >= 2.8.12 +BuildRequires: cmake >= 3.0 # Enchant plugin is currently disabled upstream #BuildRequires: enchant-devel BuildRequires: extra-cmake-modules >= %{_tar_path} @@ -43,8 +43,6 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM look-for-hunspell-1.6-as-well.patch -Patch0: look-for-hunspell-1.6-as-well.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,7 +92,6 @@ HSpell, Enchant, ASpell and HUNSPELL. Development files. %lang_package -n libKF5SonnetCore%sonum %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert From 2ab0cad59325977b40606fb79cd7f4f78da64b40482aa87b85e4262be79eaf85 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 11 Jan 2017 10:54:05 +0000 Subject: [PATCH 2/5] Updating link to change in openSUSE:Factory/sonnet revision 38.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=91cca101c3b3a4588d9969e588426ed7 --- sonnet.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sonnet.spec b/sonnet.spec index 3dcfbdf..588524d 100644 --- a/sonnet.spec +++ b/sonnet.spec @@ -43,6 +43,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM look-for-hunspell-1.6-as-well.patch +Patch0: look-for-hunspell-1.6-as-well.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -92,6 +94,7 @@ HSpell, Enchant, ASpell and HUNSPELL. Development files. %lang_package -n libKF5SonnetCore%sonum %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert From cf707de10145a8f696e0a2b6fe6fbe7349b40805f2916d636235c0bb86d0c1ea Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 11 Jan 2017 10:54:05 +0000 Subject: [PATCH 3/5] Accepting request 449220 from KDE:Frameworks5 baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/449220 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=116 --- sonnet.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/sonnet.spec b/sonnet.spec index 588524d..3dcfbdf 100644 --- a/sonnet.spec +++ b/sonnet.spec @@ -43,8 +43,6 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf -# PATCH-FIX-UPSTREAM look-for-hunspell-1.6-as-well.patch -Patch0: look-for-hunspell-1.6-as-well.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,7 +92,6 @@ HSpell, Enchant, ASpell and HUNSPELL. Development files. %lang_package -n libKF5SonnetCore%sonum %prep %setup -q -%patch0 -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert From fd8a5ec90b7dc359dabc6a2f36792bccdda018b1fa742c11afd10d56cc23044e Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 19 Jan 2017 09:20:35 +0000 Subject: [PATCH 4/5] - Remove patch, now upstream: * look-for-hunspell-1.6-as-well.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=117 --- sonnet.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sonnet.changes b/sonnet.changes index 86d5d3e..b8164ed 100644 --- a/sonnet.changes +++ b/sonnet.changes @@ -4,6 +4,8 @@ Mon Jan 9 00:00:45 UTC 2017 - hrvoje.senjan@gmail.com - Update to 5.30.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.30.0.php +- Remove patch, now upstream: + * look-for-hunspell-1.6-as-well.patch ------------------------------------------------------------------- Sun Jan 8 16:57:22 UTC 2017 - hrvoje.senjan@gmail.com From cbde91d52af24497e5cbc52aa33034d5029da29470b820fd31f9a06e68073e93 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 19 Jan 2017 09:20:46 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=118 --- look-for-hunspell-1.6-as-well.patch | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 look-for-hunspell-1.6-as-well.patch diff --git a/look-for-hunspell-1.6-as-well.patch b/look-for-hunspell-1.6-as-well.patch deleted file mode 100644 index eea5497..0000000 --- a/look-for-hunspell-1.6-as-well.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b077be472324550b2f3c7264b9efd51115b069ce Mon Sep 17 00:00:00 2001 -From: Pino Toscano -Date: Sat, 31 Dec 2016 12:06:57 +0100 -Subject: cmake: look for hunspell-1.6 as well - ---- - cmake/FindHUNSPELL.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/FindHUNSPELL.cmake b/cmake/FindHUNSPELL.cmake -index d5ed183..545dc61 100644 ---- a/cmake/FindHUNSPELL.cmake -+++ b/cmake/FindHUNSPELL.cmake -@@ -14,7 +14,7 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES) - - FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) - --FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2) -+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2) - - # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if - # all listed variables are TRUE --- -cgit v0.11.2