diff --git a/.cvsignore b/.cvsignore index 099ffb1..d9e8324 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mysql-connector-odbc-3.51.14r248.tar.gz +mysql-connector-odbc-3.51.23r998.tar.gz diff --git a/myodbc-locale.patch b/myodbc-locale.patch deleted file mode 100644 index a093e8f..0000000 --- a/myodbc-locale.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur mysql-connector-odbc-3.51.12.orig/driver/execute.c mysql-connector-odbc-3.51.12/driver/execute.c ---- mysql-connector-odbc-3.51.12.orig/driver/execute.c 2005-10-09 15:33:40.000000000 -0400 -+++ mysql-connector-odbc-3.51.12/driver/execute.c 2005-11-10 15:02:08.000000000 -0500 -@@ -226,7 +226,7 @@ - net= &stmt->dbc->mysql.net; - to= (char*) net->buff; - if ( !(stmt->dbc->flag & FLAG_NO_LOCALE) ) -- setlocale(LC_NUMERIC,"English"); /* force use of '.' as decimal point */ -+ setlocale(LC_NUMERIC,"C"); /* force use of '.' as decimal point */ - for ( i= 0; i < stmt->param_count; i++ ) - { - PARAM_BIND *param= dynamic_element(&stmt->params,i,PARAM_BIND*); -diff -Naur mysql-connector-odbc-3.51.12.orig/driver/results.c mysql-connector-odbc-3.51.12/driver/results.c ---- mysql-connector-odbc-3.51.12.orig/driver/results.c 2005-10-09 15:33:40.000000000 -0400 -+++ mysql-connector-odbc-3.51.12/driver/results.c 2005-11-10 15:01:59.000000000 -0500 -@@ -771,7 +771,7 @@ - "NULL"))); - #endif - if ( !(stmt->dbc->flag & FLAG_NO_LOCALE) ) -- setlocale(LC_NUMERIC,"English"); -+ setlocale(LC_NUMERIC,"C"); - result= sql_get_data( stmt, - (SQLSMALLINT) (fCType == SQL_C_DEFAULT ? stmt->odbc_types[icol] : fCType), - stmt->result->fields+icol, -@@ -1205,7 +1205,7 @@ - } - - if ( !(stmt->dbc->flag & FLAG_NO_LOCALE) ) -- setlocale(LC_NUMERIC,"English"); -+ setlocale(LC_NUMERIC,"C"); - res= SQL_SUCCESS; - for ( i= 0 ; i < rows_to_fetch ; i++ ) - { diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec index 61f4ae4..683c63e 100644 --- a/mysql-connector-odbc.spec +++ b/mysql-connector-odbc.spec @@ -1,7 +1,7 @@ Summary: ODBC driver for MySQL Name: mysql-connector-odbc -Version: 3.51.14r248 -Release: 3%{?dist} +Version: 3.51.23r998 +Release: 1%{?dist} Group: System Environment/Libraries URL: http://www.mysql.com/downloads/api-myodbc.html # exceptions allow library to be linked with most open source SW, @@ -9,7 +9,6 @@ URL: http://www.mysql.com/downloads/api-myodbc.html License: GPLv2 with exceptions Source: http://dev.mysql.com/downloads/connector/odbc/mysql-connector-odbc-%{version}.tar.gz -Patch1: myodbc-locale.patch Patch2: myodbc-shutdown.patch Patch3: myodbc-multilib.patch @@ -24,7 +23,6 @@ An ODBC (rev 3) driver for MySQL, for use with unixODBC. %prep %setup -q -%patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -64,6 +62,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmyodbc3_r.*a rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/README rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/README.debug rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/ChangeLog +rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/INSTALL +rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/LICENSE.exceptions +rm -f $RPM_BUILD_ROOT/usr/share/mysql-connector-odbc/LICENSE.gpl %clean rm -rf $RPM_BUILD_ROOT @@ -78,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*so %changelog +* Tue Feb 12 2008 Tom Lane 3.51.23r998-1 +- Update to mysql-connector-odbc 3.51.23r998 + * Wed Dec 5 2007 Tom Lane 3.51.14r248-3 - Rebuild for new openssl @@ -85,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT - Update License tag to match code. * Fri Apr 20 2007 Tom Lane 3.51.14r248-1 -- Update to mysql-connector-odbc 3.51.14r248-1 +- Update to mysql-connector-odbc 3.51.14r248 Resolves: #236473 - Fix build problem on multilib machines diff --git a/sources b/sources index 8fc400c..d6c7171 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87918b6daf67beebb9ddd9b576fe5d36 mysql-connector-odbc-3.51.14r248.tar.gz +74b02e2771529db36f98120f4308f9c9 mysql-connector-odbc-3.51.23r998.tar.gz