rpms/mysql-connector-java/EL-5 mysql-connector-java-noosfamily.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mysql-connector-java.spec, 1.3, 1.4 sources, 1.2, 1.3
stevetraylen
stevetraylen at fedoraproject.org
Wed Mar 24 21:28:57 UTC 2010
Author: stevetraylen
Update of /cvs/pkgs/rpms/mysql-connector-java/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17201
Modified Files:
.cvsignore mysql-connector-java.spec sources
Added Files:
mysql-connector-java-noosfamily.patch
Log Message:
First EPEL5 version.
mysql-connector-java-noosfamily.patch:
build.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE mysql-connector-java-noosfamily.patch ---
diff -uNr mysql-connector-java-5.1.12.ORIG/build.xml mysql-connector-java-5.1.12/build.xml
--- mysql-connector-java-5.1.12.ORIG/build.xml 2010-03-07 10:21:41.000000000 +0100
+++ mysql-connector-java-5.1.12/build.xml 2010-03-07 10:22:24.000000000 +0100
@@ -167,14 +167,14 @@
<filter token="VERSION" value="${version}"/>
<mkdir dir="${buildDir}" />
-
+ <!--
<exec dir="." executable="cmd" osfamily="windows"
output="${buildDir}/bzr.properties" failonerror="false"
failifexecutionfails="false">
<arg line="/c bzr version-info" />
</exec>
-
- <exec executable="bzr" osfamily="unix"
+ -->
+ <exec executable="bzr"
output="${buildDir}/bzr.properties" failonerror="false"
failifexecutionfails="false">
<arg value="version-info" />
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/EL-5/.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 24 Mar 2010 21:28:56 -0000 1.3
@@ -1 +1 @@
-mysql-connector-java-3.1.12.tar.gz
+mysql-connector-java-5.1.12.tar.gz
Index: mysql-connector-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/EL-5/mysql-connector-java.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mysql-connector-java.spec 4 Oct 2006 22:32:51 -0000 1.3
+++ mysql-connector-java.spec 24 Mar 2010 21:28:57 -0000 1.4
@@ -1,54 +1,74 @@
-%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: 3%{?dist}
-Epoch: 1
-License: GPL
-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.
+%global builddir build-mysql-jdbc
+%global distdir dist-mysql-jdbc
+%global gcj_support 1
+%global java6_rtpath %{java_home}/jre/lib/rt.jar
+%global java6_javacpath /usr/bin/javac
+%global java6_javapath /usr/bin/javac
+
+Summary: Official JDBC driver for MySQL
+Name: mysql-connector-java
+Version: 5.1.12
+Release: 2%{?dist}
+Epoch: 1
+
+# MySQL FLOSS Exception
+License: GPLv2 with exceptions
+Group: System Environment/Libraries
+URL: http://dev.mysql.com/downloads/connector/j/
+
+# No java-1.6.0-openjdk-devel on ppc
+ExcludeArch: ppc
+
+
+
+# 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
+Patch0: %{name}-noosfamily.patch
+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
-%else
-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
+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
+%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
+BuildRequires: java-1.6.0-openjdk-devel
+BuildRequires: java-devel-gcj
+BuildRequires: jakarta-commons-logging
+
+Requires: jpackage-utils
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
%description
MySQL Connector/J is a native Java driver that converts JDBC (Java Database
@@ -61,22 +81,40 @@ capabilities of MySQL.
%prep
%setup -q -n %{name}-%{version}
-%patch0
-%patch1
+%patch0 -p1
# 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/ant-contrib jdbc-stdext jta junit log4j commons-logging.jar)
+export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj
+%if 0%{?rhel} == 5
+ export JAVA_HOME=/usr/lib/jvm/java-1.4.2-gcj-1.4.2.0
+%else
+ export JAVA_HOME=/usr/lib/jvm/java-1.5.0-gcj
+%endif
+
+
+
+
+# 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
@@ -92,21 +130,38 @@ install -m 644 %{builddir}/%{name}-%{ver
%{_bindir}/aot-compile-rpm
%endif
+# Install the Maven build information
+%if 0%{?rhel} == 5
+%else
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 src/doc/sources/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+sed -i 's/>@.*</>%{version}</' $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
-%if %{gcj_support}
+%add_to_maven_depmap mysql %{name} %{version} JPP %{name}
+%endif
%post
+%if 0%{?rhel} == 5
+%else
+%update_maven_depmap
+%endif
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
+%endif
%postun
+%if 0%{?rhel} == 5
+%else
+%update_maven_depmap
+%endif
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
-
%endif
%clean
@@ -116,12 +171,56 @@ rm -rf $RPM_BUILD_ROOT
%defattr(0644,root,root,0755)
%doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README docs
%attr(0644,root,root) %{_javadir}/*.jar
+%if 0%{?rhel} == 5
+%else
+%config(noreplace) %{_mavendepmapfragdir}/*
+%{_mavenpomdir}/*.pom
+%endif
%if %{gcj_support}
%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif
%changelog
-* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.12-3
+* Wed Mar 24 2010 Steve Traylen <steve.traylen at cern.ch> - 1:5.1.12-2
+- First build for EPEL.
+- Exclude ppc arch for lack of java as far as I can tell.
+- Add osfamily.patch for older version of ant.
+
+* Fri Feb 19 2010 Miloš Jakubíček <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
+- Update to 5.1.11
+
+* Thu Jan 21 2010 Tom Lane <tgl at redhat.com> 1:5.1.8-3
+- Clean up rpmlint complaints (/usr/lib/ references, old provides/obsoletes,
+ tab usage)
+
+* Fri Dec 4 2009 Mary Ellen Foster <mefoster at gmail.com> - 1:5.1.8-2
+- Add Maven POM and depmap fragment
+
+* 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, 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
+
+* 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> 1:3.1.12-6
+- fix license tag
+
+* 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> 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
@@ -226,4 +325,3 @@ to sun classes
also build MysqlDataSource and MysqlDataSourceFactory
- build with IBM JDK 1.3.0 (cx130-20001114) and jikes 1.12
- build CLASSPATH=/usr/share/java/jdbc2_0-stdext.jar
-
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mysql-connector-java/EL-5/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 24 Mar 2010 21:28:57 -0000 1.3
@@ -1 +1 @@
-ca9d3c88dbb5ad5c724fe9ac576fc427 mysql-connector-java-3.1.12.tar.gz
+895ce91e6c9574e50fd4877e4dccb47d mysql-connector-java-5.1.12.tar.gz
More information about the scm-commits
mailing list