[mysql-connector-java] Added patch to support build with JDBC 4.1/Java 7

[Deepak Bhole]

commit 02d28708c8efbb1b3a1922861784d99b6aac480f
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Wed Jan 25 14:51:43 2012 -0500

    Added patch to support build with JDBC 4.1/Java 7

 mysql-connector-java-jdbc-4.1.patch |   37 +++++++++++++++++++++++++++++++++++
 mysql-connector-java.spec           |   10 ++++++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/mysql-connector-java-jdbc-4.1.patch b/mysql-connector-java-jdbc-4.1.patch
new file mode 100644
index 0000000..921f1f2
--- /dev/null
+++ b/mysql-connector-java-jdbc-4.1.patch
@@ -0,0 +1,37 @@
+diff -up ./src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java.sav ./src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java
+--- ./src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java.sav	2012-01-25 14:43:27.000000000 -0500
++++ ./src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java	2012-01-25 14:48:52.000000000 -0500
+@@ -40,6 +40,8 @@ import com.mysql.jdbc.ConnectionImpl;
+ import com.mysql.jdbc.Messages;
+ import com.mysql.jdbc.SQLError;
+ 
++import java.util.concurrent.Executor;
++import java.sql.SQLFeatureNotSupportedException;
+ 
+ public class JDBC4LoadBalancedMySQLConnection extends
+ 		LoadBalancedMySQLConnection implements JDBC4MySQLConnection {
+@@ -129,4 +131,24 @@ public class JDBC4LoadBalancedMySQLConne
+ 		return this.getJDBC4Connection().getClientInfoProviderImpl();
+ 	
+ 	}
++
++	public int getNetworkTimeout() throws SQLException {
++		throw new SQLFeatureNotSupportedException("Not supported");
++	}
++
++	public void setNetworkTimeout(Executor executor, int millis) throws SQLException {
++		throw new SQLFeatureNotSupportedException("Not supported");
++	}
++
++	public void abort(Executor executor) throws SQLException {
++		throw new SQLFeatureNotSupportedException("Not supported");
++	}
++
++	public String getSchema() throws SQLException {
++		throw new SQLFeatureNotSupportedException("Not supported");
++	}
++
++	public void setSchema(String schema) throws SQLException {
++		throw new SQLFeatureNotSupportedException("Not supported");
++	}
+ }
diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index 721dced..f26423a 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -8,7 +8,7 @@
 Summary:    Official JDBC driver for MySQL
 Name:       mysql-connector-java
 Version:    5.1.17
-Release:    2%{?dist}
+Release:    3%{?dist}
 Epoch:      1 
 
 # MySQL FLOSS Exception
@@ -33,6 +33,9 @@ URL:        http://dev.mysql.com/downloads/connector/j/
 # See http://bugs.mysql.com/bug.php?id=28512 for details.
 Source0:            %{name}-%{version}.tar.xz
 
+# Patch to build with JDBC 4.1/Java 7
+Patch0:             %{name}-jdbc-4.1.patch
+
 BuildRoot:          %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{gcj_support}
 BuildRequires:      java-gcj-compat-devel >= 1.0.31
@@ -76,6 +79,8 @@ rm README README.txt
 # fix line endings
 sed -i 's/\r//' docs/README.txt
 
+%patch0
+
 %build
 
 # We need both JDK1.5 (for JDBC3.0; appointed by $JAVA_HOME) and JDK1.6 (for JDBC4.0; appointed in the build.xml)
@@ -146,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Jan 25 2012 Deepak Bhole <dbhole at redhat.com> - 1:5.1.17-3
+- Added patch to support build with JDBC 4.1/Java 7
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:5.1.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild