From 878c595060d7caf867f519d4b2ae37965fce0a87 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 05:14:58 +0000
Subject: import mysql-connector-odbc-5.2.5-8.el7


---

diff --git a/SOURCES/mysql-connector-odbc-drop-odbc-linking-from-driver.patch b/SOURCES/mysql-connector-odbc-drop-odbc-linking-from-driver.patch
new file mode 100644
index 0000000..87b8a73
--- /dev/null
+++ b/SOURCES/mysql-connector-odbc-drop-odbc-linking-from-driver.patch
@@ -0,0 +1,35 @@
+This patch drops the linking of odbc library to the driver as it's not needed.
+Just linking against odbcinst is enough.
+
+The reason is the same as the one explained here:
+https://www.postgresql.org/message-id/1769926.65KUyECjFr@nb.usersys.redhat.com
+
+This fixes a problem in isql under s390x architecture.
+
+More information also here:
+https://bugzilla.redhat.com/show_bug.cgi?id=1561400
+
+diff -Naur mysql-connector-odbc-5.2.5-src-orig/cmake/FindODBC.cmake mysql-connector-odbc-5.2.5-src/cmake/FindODBC.cmake
+--- mysql-connector-odbc-5.2.5-src-orig/cmake/FindODBC.cmake	2018-04-10 16:14:29.219980686 +0200
++++ mysql-connector-odbc-5.2.5-src/cmake/FindODBC.cmake	2018-04-11 15:59:13.064365508 +0200
+@@ -106,6 +106,8 @@
+ 
+       IF(NOT ODBC_LIB_DIR)
+         _FIX_NOPREFIX(ODBC_LINK_FLAGS ${ODBC_CONFIG} "--libs")
++        _FIX_NOPREFIX(ODBC_LIB_PREFIX ${ODBC_CONFIG} "--lib-prefix")
++        SET(ODBCINST_LINK_FLAGS "-L${ODBC_LIB_PREFIX} -lodbcinst")
+       ENDIF(NOT ODBC_LIB_DIR)
+ 
+     ENDIF(NOT ODBC_CONFIG)
+diff -Naur mysql-connector-odbc-5.2.5-src-orig/driver/CMakeLists.txt mysql-connector-odbc-5.2.5-src/driver/CMakeLists.txt
+--- mysql-connector-odbc-5.2.5-src-orig/driver/CMakeLists.txt	2018-04-10 16:14:29.212980622 +0200
++++ mysql-connector-odbc-5.2.5-src/driver/CMakeLists.txt	2018-04-11 16:01:41.813735855 +0200
+@@ -57,7 +57,7 @@
+ 	TARGET_LINK_LIBRARIES(${DRIVER_NAME} myodbc3u
+ 				${MYSQL_CLIENT_LIBS} ${ODBCINSTLIB} ${SECURE32_LIB})
+ ELSE(WIN32)
+-	SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ODBC_LINK_FLAGS}")
++	SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ODBCINST_LINK_FLAGS}")
+ 	TARGET_LINK_LIBRARIES(${DRIVER_NAME} ${MYSQL_CLIENT_LIBS} ${CMAKE_THREAD_LIBS_INIT} m)
+ 	TARGET_LINK_LIBRARIES(${DRIVER_NAME} myodbc3u)
+ 
diff --git a/SPECS/mysql-connector-odbc.spec b/SPECS/mysql-connector-odbc.spec
index bb202f6..92bcffa 100644
--- a/SPECS/mysql-connector-odbc.spec
+++ b/SPECS/mysql-connector-odbc.spec
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
 Version: 5.2.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: System Environment/Libraries
 URL: http://dev.mysql.com/downloads/connector/odbc/
 # exceptions allow library to be linked with most open source SW,
@@ -34,6 +34,7 @@ Patch9: mysql-connector-odbc-cleartext.patch
 Patch10: mysql-connector-odbc-cond.patch
 Patch11: mysql-connector-odbc-5.2.5-aarch64.patch
 Patch12: 0001-Memory-leak-in-SQLPrepare-with-queries-that-use-para.patch
+Patch13: mysql-connector-odbc-drop-odbc-linking-from-driver.patch
 
 BuildRequires: mysql-devel unixODBC-devel
 BuildRequires: cmake
@@ -59,6 +60,7 @@ tar xfz %{SOURCE1}
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 # mysql 5.5.10 has stopped #define'ing THREAD in its exports, and has
@@ -105,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT/usr/test
 %{_libdir}/lib*so
 
 %changelog
+* Tue May 22 2018 Augusto Caringi <acaringi@redhat.com> - 5.2.5-8
+- Add patch to fix problem related to linking on s390x arch.
+  Resolves: #1561400
+
 * Fri Oct 13 2017 Augusto Caringi <acaringi@redhat.com> - 5.2.5-7
 - Add patch to fix memory leak in SQLPrepare.
   Resolves: #1425160