- Update to 5.1.15, fix BZ#676464, changed BR: log4j to BR: slf4j

(fix BZ#607535)

.cvsignore

@@ -1 +0,0 @@
-mysql-connector-java-5.1.11.tar.xz

.gitignore

@@ -0,0 +1,3 @@
+mysql-connector-java-5.1.12.tar.xz
+/mysql-connector-java-5.1.14.tar.xz
+/mysql-connector-java-5.1.15.tar.xz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: mysql-connector-java
-# $Id: Makefile,v 1.1 2006/09/08 21:25:23 ifoox Exp $
-NAME := mysql-connector-java
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

mysql-connector-java.spec

@@ -7,7 +7,7 @@
 
 Summary:    Official JDBC driver for MySQL
 Name:       mysql-connector-java
-Version:    5.1.11
+Version:    5.1.15
 Release:    1%{?dist}
 Epoch:      1 
 
@@ -24,17 +24,9 @@ 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/slf4j-api-1.6.1.jar
-# 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
@@ -49,14 +41,14 @@ BuildRequires:      java-devel >= 1.4.2
 Requires:           java >= 1.4.2
 %endif
 Requires:           jta >= 1.0
-Requires:           log4j
+Requires:           slf4j
 BuildRequires:      ant >= 1.6.0
 BuildRequires:      ant-contrib >= 1.0
 BuildRequires:      java-devel >= 1.4.0
 BuildRequires:      jpackage-utils >= 1.6
 BuildRequires:      jta >= 1.0
 BuildRequires:      junit
-BuildRequires:      log4j
+BuildRequires:      slf4j
 BuildRequires:      java-1.6.0-openjdk-devel
 BuildRequires:      java-1.5.0-gcj-devel
 BuildRequires:      jakarta-commons-logging
@@ -78,19 +70,15 @@ capabilities of MySQL.
 %setup -q -n %{name}-%{version}
 
 # Remove duplicate README.txt files
-rm README.txt
+rm README README.txt
-rm docs/README.txt
 
 # fix line endings
-sed -i 's/\r//' README
+sed -i 's/\r//' docs/README.txt
-sed -i 's/\r//' docs/README
-sed -i 's/\r//' EXCEPTIONS-CONNECTOR-J
-
 
 %build
 
 # We need both JDK1.5 (for JDBC3.0; appointed by $JAVA_HOME) and JDK1.6 (for JDBC4.0; appointed in the build.xml)
-export CLASSPATH=$(build-classpath jdbc-stdext jta junit log4j commons-logging.jar)
+export CLASSPATH=$(build-classpath jdbc-stdext jta junit slf4j commons-logging.jar)
 export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj
 
 # We currently need to disable jboss integration because of missing jboss-common-jdbc-wrapper.jar (built from sources).
@@ -99,6 +87,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 +95,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 +136,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,6 +145,15 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Feb 10 2011 Miloš Jakubíček <xjakub@fi.muni.cz> - 1:5.1.15-1
+- Update to 5.1.15, fix BZ#676464, changed BR: log4j to BR: slf4j
+
+* Tue Jan 18 2011 Milos Jakubicek <xjakub@fi.muni.cz> - 1:5.1.14-1
+- Update to 5.1.14
+
+* Fri Feb 19 2010 Milos Jakubicek <xjakub@fi.muni.cz> - 1:5.1.12-1
+- Update to 5.1.12
+
 * Fri Jan 29 2010 Milos Jakubicek <xjakub@fi.muni.cz> 1:5.1.11-1
 - Update to 5.1.11
 

sources

@@ -1 +1 @@
-2e80ceda60d240ea972b025d51102c08  mysql-connector-java-5.1.11.tar.xz
+119bb45f2bc3638bfd99f90a20329519  mysql-connector-java-5.1.15.tar.xz