From 461ccc4c4fccfc71b6bd77ef31928e958c7b6655933006201aefb912f846f68e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 22 Jul 2019 07:50:07 +0000 Subject: [PATCH] Accepting request 717096 from home:alarrosa:branches:devel:languages:python - Modified enchant2.patch so the enchant-2 library is used when both enchant 1 and enchant 2 are installed on the system (boo#1141993). OBS-URL: https://build.opensuse.org/request/show/717096 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyenchant?expand=0&rev=23 --- enchant2.patch | 14 +++++++------- python-pyenchant.changes | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/enchant2.patch b/enchant2.patch index a84ad58..a7a1413 100644 --- a/enchant2.patch +++ b/enchant2.patch @@ -12,11 +12,11 @@ Index: pyenchant-2.0.0/enchant/_enchant.py =================================================================== --- pyenchant-2.0.0.orig/enchant/_enchant.py +++ pyenchant-2.0.0/enchant/_enchant.py -@@ -71,6 +71,7 @@ def _e_path_possibilities(): - yield "libenchant.so.1" - yield "libenchant.so" - # See if ctypes can find the library for us, under various names. +@@ -65,6 +65,7 @@ def _e_path_possibilities(): + """Generator yielding possible locations of the enchant library.""" + # Allow it to be overridden using an environment variable. + yield os.environ.get("PYENCHANT_LIBRARY_PATH") + yield find_library("enchant-2") - yield find_library("enchant") - yield find_library("libenchant") - yield find_library("libenchant-1") + # For linuxish systems, allow default soname lookup a chance to succeed. + if sys.platform not in ("win32", "darwin"): + yield "libenchant.so.1.6.0" diff --git a/python-pyenchant.changes b/python-pyenchant.changes index e1837c1..f9298df 100644 --- a/python-pyenchant.changes +++ b/python-pyenchant.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 19 10:11:23 UTC 2019 - Antonio Larrosa + +- Modified enchant2.patch so the enchant-2 library is used when both + enchant 1 and enchant 2 are installed on the system (boo#1141993). + ------------------------------------------------------------------- Tue Jan 8 10:48:47 UTC 2019 - alarrosa@suse.com