[mysql-connector-java/f14/master] update to 5.1.14

[Miloš Jakubíček]

commit 7c8594709266e9cd1bc3e440e9df3a9091b8eeed
Author: Milos Jakubicek <xjakub at fi.muni.cz>
Date:   Tue Jan 18 14:56:41 2011 +0100

    update to 5.1.14
    
    (fix BZ#607535)

 .gitignore                |    1 +
 mysql-connector-java.spec |   27 ++++++++++-----------------
 sources                   |    2 +-
 3 files changed, 12 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eba3e25..cdbdd9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 mysql-connector-java-5.1.12.tar.xz
+/mysql-connector-java-5.1.14.tar.xz
diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index af7c4d5..2fecc02 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -7,7 +7,7 @@
 
 Summary:    Official JDBC driver for MySQL
 Name:       mysql-connector-java
-Version:    5.1.12
+Version:    5.1.14
 Release:    1%{?dist}
 Epoch:      1 
 
@@ -24,17 +24,10 @@ URL:        http://dev.mysql.com/downloads/connector/j/
 #
 # %{name}-%{version}-bin.jar
 # src/lib/ant-contrib.jar
-# src/lib/commons-logging.jar
-# src/lib/Commons-Logging-LICENSE.txt
 # src/lib/c3p0-LICENSE
 # src/lib/c3p0-0.9.1-pre6.jar
 # src/lib/jboss-common-jdbc-wrapper.jar
 # src/lib/jboss-lgpl.txt
-# src/lib/jdbc2_0-stdext.jar
-# src/lib/jta-spec1_0_1.jar
-# src/lib/junit.jar
-# src/lib/LICENSE-AspectJ.html
-# src/lib/log4j-1.2.9.jar
 #
 # See http://bugs.mysql.com/bug.php?id=28512 for details.
 Source0:            %{name}-%{version}.tar.xz
@@ -78,14 +71,10 @@ capabilities of MySQL.
 %setup -q -n %{name}-%{version}
 
 # Remove duplicate README.txt files
-rm README.txt
-rm docs/README.txt
+rm README README.txt
 
 # fix line endings
-sed -i 's/\r//' README
-sed -i 's/\r//' docs/README
-sed -i 's/\r//' EXCEPTIONS-CONNECTOR-J
-
+sed -i 's/\r//' docs/README.txt
 
 %build
 
@@ -99,6 +88,7 @@ rm -rf src/com/mysql/jdbc/integration/jboss
 rm src/testsuite/regression/ConnectionRegressionTest.java
 rm src/testsuite/regression/DataSourceRegressionTest.java
 rm src/testsuite/simple/ReadOnlyCallableStatementTest.java
+rm src/testsuite/simple/jdbc4/StatementsTest.java
 
 ant -DbuildDir=%{builddir} -DdistDir=%{distdir} -Dcom.mysql.jdbc.java6.rtjar=%{java6_rtpath} -Dcom.mysql.jdbc.java6.javac=%{java6_javacpath} -Dcom.mysql.jdbc.java6.java=%{java6_javapath}
 
@@ -106,7 +96,7 @@ ant -DbuildDir=%{builddir} -DdistDir=%{distdir} -Dcom.mysql.jdbc.java6.rtjar=%{j
 rm -rf $RPM_BUILD_ROOT
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 %{builddir}/%{name}-%{version}/%{name}-%{version}-bin.jar \
+install -m 644 %{builddir}/%{name}-%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT-bin.jar \
     $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
@@ -147,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(0644,root,root,0755)
-%doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README docs
+%doc CHANGES COPYING docs
 %attr(0644,root,root) %{_javadir}/*.jar
 %config(noreplace) %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*.pom
@@ -156,7 +146,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
-* Fri Feb 19 2010 Miloš Jakubíček <xjakub at fi.muni.cz> - 1:5.1.12-1
+* Tue Jan 18 2011 Milos Jakubicek <xjakub at fi.muni.cz> - 1:5.1.14-1
+- Update to 5.1.14
+
+* Fri Feb 19 2010 Milos Jakubicek <xjakub at fi.muni.cz> - 1:5.1.12-1
 - Update to 5.1.12
 
 * Fri Jan 29 2010 Milos Jakubicek <xjakub at fi.muni.cz> 1:5.1.11-1
diff --git a/sources b/sources
index 49b54d0..e84e8ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72941cd4c75d0dc30c86c5b572d7b124  mysql-connector-java-5.1.12.tar.xz
+84140384120c0ade054184a82ac95e06  mysql-connector-java-5.1.14.tar.xz