From 8be81f862e5a930216ae61f18312d2d46cffc08dc952afaf56e8ad26a06d4aa1 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 24 Nov 2018 16:39:44 +0000 Subject: [PATCH] Accepting request 651535 from home:Vogtinator:branches:KDE:Extra - Rewrite hunspell-1.6.patch into hunspell.patch to cover all hunspell versions OBS-URL: https://build.opensuse.org/request/show/651535 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=41 --- hunspell-1.6.patch => hunspell.patch | 6 ++++-- scribus.changes | 6 ++++++ scribus.spec | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) rename hunspell-1.6.patch => hunspell.patch (80%) diff --git a/hunspell-1.6.patch b/hunspell.patch similarity index 80% rename from hunspell-1.6.patch rename to hunspell.patch index e9576ef..4b8ef39 100644 --- a/hunspell-1.6.patch +++ b/hunspell.patch @@ -1,8 +1,10 @@ From: Wolfgang Bauer -Subject: support hunspell up to 1.6 +Subject: Try to build against any hunspell version Necessary to have spellchecking support in Tumbleweed and Leap 15.0, which have hunspell 1.6.2 that wasn't found and spellchecking got disabled... + +Edited-by: Fabian Vogt --- diff -Nru a/cmake/modules/FindHUNSPELL.cmake b/cmake/modules/FindHUNSPELL.cmake --- a/cmake/modules/FindHUNSPELL.cmake 2012-04-10 22:17:07.000000000 +0200 @@ -12,7 +14,7 @@ diff -Nru a/cmake/modules/FindHUNSPELL.cmake b/cmake/modules/FindHUNSPELL.cmake FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) -FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) -+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) ++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell PATHS /opt/local/lib /usr/local/lib /usr/lib ) INCLUDE(FindPackageHandleStandardArgs) # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE diff --git a/scribus.changes b/scribus.changes index 361a876..e6eac70 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 24 16:26:56 UTC 2018 - Fabian Vogt + +- Rewrite hunspell-1.6.patch into hunspell.patch to cover all hunspell + versions + ------------------------------------------------------------------- Sat Nov 24 10:55:44 UTC 2018 - wbauer@tmo.at diff --git a/scribus.spec b/scribus.spec index 7af04e7..8e430a9 100644 --- a/scribus.spec +++ b/scribus.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -32,7 +32,7 @@ Source4: %{name}-icon128.png Source5: %{name}-icon256.png Source6: %{name}.appdata.xml # PATCH-FIX-OPENSUSE -Patch: hunspell-1.6.patch +Patch: hunspell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1325