diff --git a/hunspell-1.6.patch b/hunspell.patch similarity index 80% rename from hunspell-1.6.patch rename to hunspell.patch index afcf234..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.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 4e9f2e8..e6eac70 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 + +- Update hunspell-1.6.patch to also accept hunspell 1.7 that's in + Factory now + ------------------------------------------------------------------- Wed May 30 08:03:23 UTC 2018 - jengelh@inai.de 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