libiodbc2 (3.52.6-4) 01_so.diff

Summary

 iodbc/connect.c                 |    2 +-
 iodbcadm/drvconn.c              |    2 +-
 iodbcadm/gtk/administrator.c    |   10 +++++-----
 iodbcinst/SQLConfigDataSource.c |    4 ++--
 iodbcinst/SQLConfigDriver.c     |    4 ++--
 iodbcinst/SQLCreateDataSource.c |    4 ++--
 iodbcinst/SQLGetTranslator.c    |    4 ++--
 iodbcinst/SQLManageDataSource.c |    2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

    
download this patch

Patch contents

diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/libiodbc2-3.52.6/iodbc/connect.c ./iodbc/connect.c
--- ../orig/libiodbc2-3.52.6/iodbc/connect.c	2007-09-10 09:42:27.000000000 +0200
+++ ./iodbc/connect.c	2008-03-01 19:39:49.000000000 +0100
@@ -2598,7 +2598,7 @@
 	    CFRelease (libname);
 	}
 #else
-      hdll = _iodbcdm_dllopen ("libiodbcadm.so");
+      hdll = _iodbcdm_dllopen ("libiodbcadm.so.2");
 #endif
 
       if (!hdll)
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/libiodbc2-3.52.6/iodbcadm/drvconn.c ./iodbcadm/drvconn.c
--- ../orig/libiodbc2-3.52.6/iodbcadm/drvconn.c	2006-07-11 11:40:35.000000000 +0200
+++ ./iodbcadm/drvconn.c	2008-03-01 19:41:51.000000000 +0100
@@ -470,7 +470,7 @@
 	}
     }
 #else
-  CALL_DRVCONN_DIALBOXW ("libdrvproxy.so", 'A');
+  CALL_DRVCONN_DIALBOXW ("libdrvproxy.so.2", 'A');
 #endif /* __APPLE__ */
 
   if (sqlStat)
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/libiodbc2-3.52.6/iodbcadm/gtk/administrator.c ./iodbcadm/gtk/administrator.c
--- ../orig/libiodbc2-3.52.6/iodbcadm/gtk/administrator.c	2007-02-02 12:58:14.000000000 +0100
+++ ./iodbcadm/gtk/administrator.c	2008-03-01 19:41:41.000000000 +0100
@@ -111,11 +111,11 @@
   char *lib_ver_sym;
 } iODBC_Components[] =
 {
-  {"libiodbc.so", "iODBC Driver Manager", "iodbc_version"},
-  {"libiodbcadm.so", "iODBC Administrator", "iodbcadm_version"},
-  {"libiodbcinst.so", "iODBC Installer", "iodbcinst_version"},
-  {"libdrvproxy.so", "iODBC Driver Setup Proxy", "iodbcproxy_version"},
-  {"libtranslator.so", "iODBC Translation Manager", "iodbctrans_version"}
+  {"libiodbc.so.2", "iODBC Driver Manager", "iodbc_version"},
+  {"libiodbcadm.so.2", "iODBC Administrator", "iodbcadm_version"},
+  {"libiodbcinst.so.2", "iODBC Installer", "iodbcinst_version"},
+  {"libdrvproxy.so.2", "iODBC Driver Setup Proxy", "iodbcproxy_version"},
+  {"libtranslator.so.2", "iODBC Translation Manager", "iodbctrans_version"}
 };
 
 
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/libiodbc2-3.52.6/iodbcinst/SQLConfigDataSource.c ./iodbcinst/SQLConfigDataSource.c
--- ../orig/libiodbc2-3.52.6/iodbcinst/SQLConfigDataSource.c	2006-01-23 11:28:27.000000000 +0100
+++ ./iodbcinst/SQLConfigDataSource.c	2008-03-01 19:41:24.000000000 +0100
@@ -452,11 +452,11 @@
 #else
   if (waMode == 'A')
     {
-      CALL_CONFIG_DSN ("libdrvproxy.so");
+      CALL_CONFIG_DSN ("libdrvproxy.so.2");
     }
   else
     {
-      CALL_CONFIG_DSNW ("libdrvproxy.so");
+      CALL_CONFIG_DSNW ("libdrvproxy.so.2");
     }
 #endif
 
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/libiodbc2-3.52.6/iodbcinst/SQLConfigDriver.c ./iodbcinst/SQLConfigDriver.c
--- ../orig/libiodbc2-3.52.6/iodbcinst/SQLConfigDriver.c	2006-01-23 11:28:27.000000000 +0100
+++ ./iodbcinst/SQLConfigDriver.c	2008-03-01 19:40:07.000000000 +0100
@@ -372,11 +372,11 @@
 #else
   if (waMode == 'A')
     {
-      CALL_CONFIG_DRIVER ("libdrvproxy.so");
+      CALL_CONFIG_DRIVER ("libdrvproxy.so.2");
     }
   else
     {
-      CALL_CONFIG_DRIVERW ("libdrvproxy.so");
+      CALL_CONFIG_DRIVERW ("libdrvproxy.so.2");
     }
 #endif
 
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/libiodbc2-3.52.6/iodbcinst/SQLCreateDataSource.c ./iodbcinst/SQLCreateDataSource.c
--- ../orig/libiodbc2-3.52.6/iodbcinst/SQLCreateDataSource.c	2006-01-25 23:22:22.000000000 +0100
+++ ./iodbcinst/SQLCreateDataSource.c	2008-03-01 19:40:53.000000000 +0100
@@ -157,11 +157,11 @@
 #else
   if (waMode == 'A')
     {
-      CALL_DRVCONN_DIALBOX ("libiodbcadm.so");
+      CALL_DRVCONN_DIALBOX ("libiodbcadm.so.2");
     }
   else
     {
-      CALL_DRVCONN_DIALBOXW ("libiodbcadm.so");
+      CALL_DRVCONN_DIALBOXW ("libiodbcadm.so.2");
     }
 #endif
 
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/libiodbc2-3.52.6/iodbcinst/SQLGetTranslator.c ./iodbcinst/SQLGetTranslator.c
--- ../orig/libiodbc2-3.52.6/iodbcinst/SQLGetTranslator.c	2006-01-23 11:28:27.000000000 +0100
+++ ./iodbcinst/SQLGetTranslator.c	2008-03-01 19:40:23.000000000 +0100
@@ -172,7 +172,7 @@
 	    CFRelease (libname);
 	}
 #else
-      CALL_TRSCHOOSE_DIALBOX ("libiodbcadm.so");
+      CALL_TRSCHOOSE_DIALBOX ("libiodbcadm.so.2");
 #endif
 
       if (ret == SQL_NO_DATA)
@@ -229,7 +229,7 @@
 	    }
 
 	  /* The last ressort, a proxy driver */
-	  CALL_CONFIG_TRANSLATOR ("libtranslator.so");
+	  CALL_CONFIG_TRANSLATOR ("libtranslator.so.2");
 
 	  /* Error : ConfigDSN could no be found */
 	  PUSH_ERROR (ODBC_ERROR_LOAD_LIB_FAILED);
diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/libiodbc2-3.52.6/iodbcinst/SQLManageDataSource.c ./iodbcinst/SQLManageDataSource.c
--- ../orig/libiodbc2-3.52.6/iodbcinst/SQLManageDataSource.c	2006-01-23 11:28:27.000000000 +0100
+++ ./iodbcinst/SQLManageDataSource.c	2008-03-01 19:40:38.000000000 +0100
@@ -134,7 +134,7 @@
     }
 
 #else
-  CALL_ADMIN_DIALBOX ("libiodbcadm.so");
+  CALL_ADMIN_DIALBOX ("libiodbcadm.so.2");
 #endif
 
   return retcode;