From 009ea08edf4d87d700e3e8654258323ae8504bc1 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Jul 23 2012 00:47:35 +0000 Subject: Update to 5.1.11 --- diff --git a/.gitignore b/.gitignore index 407f116..c7f5464 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/mysql-connector-odbc-5.1.10-src.tar.gz +/mysql-connector-odbc-5.1.11-src.tar.gz /mysql-mysys.tar.gz diff --git a/myodbc-makefile.patch b/myodbc-makefile.patch new file mode 100644 index 0000000..f8f4b46 --- /dev/null +++ b/myodbc-makefile.patch @@ -0,0 +1,23 @@ +It appears upstream has stopped maintaining the autoconf build files, +even though they still ship 'em. At some point we should probably +switch to the cmake build system, but I don't feel like investing time +in that now. + + +diff -Naur mysql-connector-odbc-5.1.11-src.orig/driver/Makefile.am mysql-connector-odbc-5.1.11-src/driver/Makefile.am +--- mysql-connector-odbc-5.1.11-src.orig/driver/Makefile.am 2012-04-27 18:12:39.000000000 -0400 ++++ mysql-connector-odbc-5.1.11-src/driver/Makefile.am 2012-07-22 20:38:59.494830648 -0400 +@@ -47,10 +47,13 @@ + handle.c\ + info.c \ + options.c \ ++parse.c \ + prepare.c \ + results.c \ + transact.c \ + unicode.c \ ++my_prepared_stmt.c \ ++my_stmt.c \ + utility.c \ + driver.h + diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec index 29d6ede..25e8ef0 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: 5.1.10 -Release: 2%{?dist} +Version: 5.1.11 +Release: 1%{?dist} Group: System Environment/Libraries URL: http://dev.mysql.com/downloads/connector/odbc/ # exceptions allow library to be linked with most open source SW, @@ -25,6 +25,7 @@ Source1: mysql-mysys.tar.gz Patch1: myodbc-add-mysys.patch Patch2: myodbc-shutdown.patch Patch3: myodbc-64bit.patch +Patch4: myodbc-makefile.patch BuildRequires: mysql-devel unixODBC-devel BuildRequires: automake autoconf libtool libtool-ltdl-devel @@ -41,6 +42,7 @@ tar xfz %{SOURCE1} %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build # mysql 5.5.10 has stopped #define'ing THREAD in its exports, and has @@ -100,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib*so %changelog +* Sun Jul 22 2012 Tom Lane 5.1.11-1 +- Update to 5.1.11 + * Fri Jul 20 2012 Fedora Release Engineering - 5.1.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index eeb555b..24adb29 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -71d570a7f6839b81d101bf803e4f864a mysql-connector-odbc-5.1.10-src.tar.gz +1d868f404038bbce6623a28255c8a9f7 mysql-connector-odbc-5.1.11-src.tar.gz 58125c640c9c73c5288966bb85e6bb98 mysql-mysys.tar.gz