rpms/mysql-connector-java/devel .cvsignore, 1.2, 1.3 mysql-connector-java.spec, 1.8, 1.9 sources, 1.2, 1.3 mysql-connector-java-noSunAppletSecurity.patch, 1.1, NONE patch-build.xml, 1.1, NONE

Wed Aug 26 01:15:04 UTC 2009

Author: mjakubicek

Update of /cvs/pkgs/rpms/mysql-connector-java/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23241

Modified Files:
	.cvsignore mysql-connector-java.spec sources 
Removed Files:
	mysql-connector-java-noSunAppletSecurity.patch patch-build.xml 
Log Message:
- Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled.
- Added BR: java-1.6.0-openjdk-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




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- .cvsignore	8 Sep 2006 21:26:15 -0000	1.2
+++ .cvsignore	26 Aug 2009 01:15:04 -0000	1.3
@@ -1 +1 @@
-mysql-connector-java-3.1.12.tar.gz
+mysql-connector-java-5.1.8.tar.gz


Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/devel/mysql-connector-java.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mysql-connector-java.spec	25 Jul 2009 15:30:44 -0000	1.8
+++ mysql-connector-java.spec	26 Aug 2009 01:15:04 -0000	1.9
@@ -1,55 +1,65 @@
-%define            builddir       build-mysql-jdbc
-%define            distdir        dist-mysql-jdbc
-%define            gcj_support    1
-
-Summary:           Official JDBC driver for MySQL
-Name:              mysql-connector-java
-Version:           3.1.12
-Release:           8%{?dist}
-Epoch:             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 
+
 # 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
+#
+# Following prebuilt jars have been removed from the tarball:
 #
-# src/lib/ant-contrib.jar 
-# src/lib/jta-spec1_0_1.jar 
+# %{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:		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 +72,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,22 +142,28 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Aug 26 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 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, 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
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.1.12-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:3.1.12-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 3.1.12-6
+* Mon Aug 11 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.1.12-6
 - fix license tag
 
-* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 3.1.12-5
+* Fri Apr 04 2008 Andrew Overholt <overholt at redhat.com> 1:3.1.12-5
 - Rebuild for rhbz #234286.
 
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1:3.1.12-4
 - Autorebuild for GCC 4.3
 
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.12-3
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 1:3.1.12-3
  - rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Thu Sep 21 2006 Igor Foox <ifoox at redhat.com> 1:3.1.12-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	8 Sep 2006 21:26:15 -0000	1.2
+++ sources	26 Aug 2009 01:15:04 -0000	1.3
@@ -1 +1 @@
-ca9d3c88dbb5ad5c724fe9ac576fc427  mysql-connector-java-3.1.12.tar.gz
+815783766d36eb650be60718cc0be84c  mysql-connector-java-5.1.8.tar.gz


--- mysql-connector-java-noSunAppletSecurity.patch DELETED ---


--- patch-build.xml DELETED ---


