diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e2f8350..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: mysql-connector-java -# $Id$ -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 $$/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) diff --git a/mysql-connector-java-noSunAppletSecurity.patch b/mysql-connector-java-noSunAppletSecurity.patch deleted file mode 100644 index d3c3068..0000000 --- a/mysql-connector-java-noSunAppletSecurity.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- src/testsuite/regression/AppletRegressionTest.java.orig 2006-05-31 11:43:13.000000000 -0400 -+++ src/testsuite/regression/AppletRegressionTest.java 2006-05-31 11:44:23.000000000 -0400 -@@ -26,7 +26,7 @@ - - import java.util.Properties; - --import sun.applet.AppletSecurity; -+//import sun.applet.AppletSecurity; - import testsuite.BaseTestCase; - - /** -@@ -66,9 +66,9 @@ - * @throws Exception - * if the test fails - */ -- public void testAppletSecurityManager() throws Exception { -+ public void testSecurityManagerManager() throws Exception { - if ("true".equalsIgnoreCase(System.getProperty(TOGGLE_RUN_PROPERTY))) { -- System.setSecurityManager(new CustomAppletSecurity()); -+ System.setSecurityManager(new CustomSecurityManager()); - - getConnectionWithProps(new Properties()); - } -@@ -78,7 +78,7 @@ - * We need to customize the security manager a 'bit', so that JUnit still - * works (and we can connect to various databases). - */ -- class CustomAppletSecurity extends AppletSecurity { -+ class CustomSecurityManager extends SecurityManager { - /* - * (non-Javadoc) - * diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index d4b96f1..99d4f0d 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,55 +1,66 @@ -%define builddir build-mysql-jdbc -%define distdir dist-mysql-jdbc -%define gcj_support 1 +%global builddir build-mysql-jdbc +%global distdir dist-mysql-jdbc +%global gcj_support 1 +%global java6_rtpath /usr/lib/jvm/java-1.6.0/jre/lib/rt.jar +%global java6_javacpath /usr/lib/jvm/java-1.6.0/bin/javac +%global java6_javapath /usr/lib/jvm/java-1.6.0/bin/javac + +Summary: Official JDBC driver for MySQL +Name: mysql-connector-java +Version: 5.1.8 +Release: 1%{?dist} +Epoch: 1 -Summary: Official JDBC driver for MySQL -Name: mysql-connector-java -Version: 3.1.12 -Release: 6%{?dist} -Epoch: 1 # MySQL FLOSS Exception -License: GPLv2 with exceptions -Group: System Environment/Libraries -# ************ NOTE ************ -# The following files have been removed from the tarball to avoid licensing -# issues due to the fact that they are not distributed with their source. +License: GPLv2 with exceptions +Group: System Environment/Libraries +# Mysql has a mirror redirector for its downloads +# You can get this tarball by following a link from: +# http://dev.mysql.com/get/Downloads/Connector-J/%{name}-%{version}.tar.gz/from/pick#mirrors # -# src/lib/ant-contrib.jar -# src/lib/jta-spec1_0_1.jar +# Following prebuilt jars have been removed from the tarball: +# +# %{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 -# src/lib/aspectjrt.jar -# src/lib/aspectjtools.jar -# src/lib/c3p0-0.8.5-pre8.jar -# src/lib/jboss-common-jdbc-wrapper.jar -# src/lib/jboss-lgpl.txt -# src/lib/jdbc2_0-stdext.jar -# mysql-connector-java-3.1.12-bin.jar -# debug/mysql-connector-java-3.1.12-bin-g.jar -Source0: %{name}-%{version}.tar.gz -Patch0: patch-build.xml -Patch1: mysql-connector-java-noSunAppletSecurity.patch -URL: http://dev.mysql.com/downloads/connector/j/3.1.html -BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n) +# +# See http://bugs.mysql.com/bug.php?id=28512 for details. + +Source0: %{name}-%{version}.tar.gz +URL: http://dev.mysql.com/downloads/connector/j/5.1.html +BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n) %if %{gcj_support} -BuildRequires: java-gcj-compat-devel >= 1.0.31 -Requires(post): java-gcj-compat >= 1.0.31 -Requires(postun): java-gcj-compat >= 1.0.31 +BuildRequires: java-gcj-compat-devel >= 1.0.31 +Requires(post): java-gcj-compat >= 1.0.31 +Requires(postun): java-gcj-compat >= 1.0.31 %else -BuildRequires: java-devel >= 1.4.2 -Requires: java >= 1.4.2 +BuildRequires: java-devel >= 1.4.2 +Requires: java >= 1.4.2 %endif -Requires: jta >= 1.0 -Requires: log4j -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 -Provides: mm.mysql -Obsoletes: mm.mysql +Requires: jta >= 1.0 +Requires: log4j +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: java-1.6.0-openjdk-devel +BuildRequires: java-1.5.0-gcj-devel +BuildRequires: jakarta-commons-logging +Provides: mm.mysql +Obsoletes: mm.mysql %description MySQL Connector/J is a native Java driver that converts JDBC (Java Database @@ -62,22 +73,32 @@ capabilities of MySQL. %prep %setup -q -n %{name}-%{version} -%patch0 -%patch1 # Remove duplicate README.txt files rm README.txt rm docs/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//' README +sed -i 's/\r//' docs/README +sed -i 's/\r//' EXCEPTIONS-CONNECTOR-J %build -export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j) -ant -DbuildDir=%{builddir} -DdistDir=%{distdir} + +# 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 ant-contrib jdbc-stdext jta junit log4j 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). +# See BZ#480154 and BZ#471915 for details. +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 + +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} + %install rm -rf $RPM_BUILD_ROOT @@ -122,16 +143,22 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Mon Aug 11 2008 Tom "spot" Callaway 3.1.12-6 +* Tue Aug 26 2009 Milos Jakubicek - 1:5.1.8-1 +- Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled. +- Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging +- Minor spec file updates: %%global instead of %%define, tabs instead of spaces +- Dropped unnecessary patch-build.xml and mysql-connector-java-noSunAppletSecurity.patch + +* Mon Aug 11 2008 Tom "spot" Callaway 1:3.1.12-6 - fix license tag -* Fri Apr 04 2008 Andrew Overholt 3.1.12-5 +* Fri Apr 04 2008 Andrew Overholt 1:3.1.12-5 - Rebuild for rhbz #234286. * Tue Feb 19 2008 Fedora Release Engineering - 1:3.1.12-4 - Autorebuild for GCC 4.3 -* Thu Oct 05 2006 Christian Iseli 3.1.12-3 +* Thu Oct 05 2006 Christian Iseli 1:3.1.12-3 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Thu Sep 21 2006 Igor Foox 1:3.1.12-2 diff --git a/patch-build.xml b/patch-build.xml deleted file mode 100644 index aabc5f9..0000000 --- a/patch-build.xml +++ /dev/null @@ -1,13 +0,0 @@ ---- build.xml.orig 2006-01-31 15:27:27.000000000 -0800 -+++ build.xml 2006-01-31 15:28:05.000000000 -0800 -@@ -60,10 +60,6 @@ - - - -- -- -- -- - - - diff --git a/sources b/sources index e656466..c1c019e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca9d3c88dbb5ad5c724fe9ac576fc427 mysql-connector-java-3.1.12.tar.gz +815783766d36eb650be60718cc0be84c mysql-connector-java-5.1.8.tar.gz