Accepting request 451322 from KDE:Frameworks5

5.30 for 5.9 Beta

OBS-URL: https://build.opensuse.org/request/show/451322
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sonnet?expand=0&rev=39
This commit is contained in:
Dominique Leuenberger 2017-01-31 11:13:33 +00:00 committed by Git OBS Bridge
commit 9302f63bf1
5 changed files with 15 additions and 33 deletions

View File

@ -1,24 +0,0 @@
From b077be472324550b2f3c7264b9efd51115b069ce Mon Sep 17 00:00:00 2001
From: Pino Toscano <pino@kde.org>
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:20358de0d45387f44260c3e6f8df012d661b4446293cbb3823c978e3a8766965
size 2652812

3
sonnet-5.30.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:99fd42d919d3350e22ae99fc480a14bc30ebd461b064ef24aed5042c772a91c4
size 281828

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
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

View File

@ -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