diff --git a/0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch b/0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch new file mode 100644 index 0000000..c004ad0 --- /dev/null +++ b/0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch @@ -0,0 +1,39 @@ +From 18f068baca7630afdc8d02a4e21a4aa1a9d70f86 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Thu, 5 Jan 2017 16:06:10 +0100 +Subject: [PATCH] unixODBC changed soname to .2 so reflect it + +we dlopen this library and thus we should be able to find it with any +soname, so far .1 and .2 seem to be used. + +Change-Id: Idcd284fada1acdfe8dde46c3056c21b792777280 +--- + dbaccess/source/ui/dlg/odbcconfig.cxx | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx +index cd1b583e1840..163fc8549d06 100644 +--- a/dbaccess/source/ui/dlg/odbcconfig.cxx ++++ b/dbaccess/source/ui/dlg/odbcconfig.cxx +@@ -38,6 +38,7 @@ + #ifdef MACOSX + #define ODBC_LIBRARY "libiodbc.dylib" + #else ++#define ODBC_LIBRARY_2 "libodbc.so.2" + #define ODBC_LIBRARY_1 "libodbc.so.1" + #define ODBC_LIBRARY "libodbc.so" + #endif +@@ -124,6 +125,10 @@ OOdbcEnumeration::OOdbcEnumeration() + if ( !bLoaded ) + bLoaded = load(ODBC_LIBRARY_1); + #endif ++#ifdef ODBC_LIBRARY_2 ++ if ( !bLoaded ) ++ bLoaded = load(ODBC_LIBRARY_2); ++#endif + + if ( bLoaded ) + { +-- +2.11.0 + diff --git a/libreoffice.changes b/libreoffice.changes index 9908773..422a141 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 5 15:08:29 UTC 2017 - tchvatal@suse.com + +- Fix unixODBC loading bnc#1017925 + * 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch + ------------------------------------------------------------------- Wed Jan 4 20:11:44 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index eeb66f4..f6eed51 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -78,6 +78,7 @@ Patch3: system-pyuno.diff # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch4: nlpsolver-no-broken-help.diff Patch5: mediawiki-no-broken-help.diff +Patch6: 0001-unixODBC-changed-soname-to-.2-so-reflect-it.patch # PATCH-HOTFIX-UPSTREAM: disable test that rounds wrongly on most archs Patch16: libreoffice-hotfix-disablebrokenshapetest.patch # try to save space by using hardlinks @@ -938,6 +939,7 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch3 -p1 %patch4 %patch5 +%patch6 -p1 %patch16 -p1 %patch990 -p1