Hello community,
here is the log from the commit of package mysql-connector-java for
openSUSE:Factory checked in at 2012-06-18 16:33:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-java (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-java.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-java", Maintainer is
"bnc-team-j...@forge.provo.novell.com"
Changes:
--------
---
/work/SRC/openSUSE:Factory/mysql-connector-java/mysql-connector-java.changes
2012-05-21 08:06:43.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-connector-java.new/mysql-connector-java.changes
2012-06-18 16:33:46.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jun 18 13:16:57 UTC 2012 - mvysko...@suse.cz
+
+- fix a build with jdk7 (build jdbc 3.0 with gcj)
+- remove some obsoleted macros (gcj, jboss)
+- remove jars from source file as well
+
+-------------------------------------------------------------------
Old:
----
mysql-connector-java-5.1.6-disableJDBC4.patch
mysql-connector-java-5.1.6-java6-compatibility.patch
mysql-connector-java-suse-docs.patch
New:
----
mysql-connector-java-5.1.19-java7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-java.spec ++++++
--- /var/tmp/diff_new_pack.hCfws8/_old 2012-06-18 16:33:48.000000000 +0200
+++ /var/tmp/diff_new_pack.hCfws8/_new 2012-06-18 16:33:48.000000000 +0200
@@ -17,45 +17,45 @@
# icecream 0
-%define section free
-%define builddir build-mysql-jdbc
-%define distdir dist-mysql-jdbc
-%define with_jboss4 0
-
Name: mysql-connector-java
+Version: 5.1.19
+Release: 0
Summary: Official JDBC Driver for MySQL
License: GPL-2.0+
Group: Development/Libraries/Java
-Version: 5.1.19
-Release: 0
+Url: http://www.mysql.com/downloads/api-jdbc-stable.html
+
# docs are now under very strict proprietary license by Oracle, so lets not
distribute them
+# remove bundled jars as well
# tar -xf %{name}-%{version}.tar.gz
-# rm -rf %{name}-%{version}/docs %{name}-%{version}/%{name}-%{version}-bin.jar
+# rm -rf %{name}-%{version}/docs
+# find %{name}-%{version} -name '*jar' -delete
# tar -xJf %{name}-%{version}-suse.tar.xz
Source0: %{name}-%{version}-suse.tar.xz
-Patch2: %{name}-5.1.6-java6-compatibility.patch
-Patch3: %{name}-5.1.6-disableJDBC4.patch
-#PATCH-FIX-SUSE: inform users about fact the documentation is not distributed
anymore
-Patch4: mysql-connector-java-suse-docs.patch
-Url: http://www.mysql.com/downloads/api-jdbc-stable.html
+# Patch to build with JDBC 4.1/Java 7
+Patch0: mysql-connector-java-5.1.19-java7.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
+
BuildRequires: ant
BuildRequires: ant-contrib
BuildRequires: apache-commons-logging
+BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: java-devel
+BuildRequires: jta
+BuildRequires: junit
BuildRequires: slf4j
#!BuildIgnore: maven2-bootstrap
-%if %{with_jboss4}
-BuildRequires: jboss4-common
-BuildRequires: jboss4-connector
-%endif
-BuildRequires: jpackage-utils
-BuildRequires: junit
BuildRequires: log4j-mini
+
+Requires: jta >= 1.0
Requires: log4j
+Requires: slf4j
+
Provides: mm.mysql = %{version}
Obsoletes: mm.mysql < %{version}
+
# manual is no longer distributed
Provides: %{name}-manual = %{version}
Obsoletes: %{name}-manual < %{version}
@@ -71,18 +71,7 @@
%prep
%setup -q -n %{name}-%{version}
-# patch only for javac 1.6.0
-if [[ "$(javac -version 2>&1 | grep '1\.6\.0')" != "" ]]; then
-%patch2 -b .sav2
-fi
-%patch3
-%patch4 -p1
-# remove all binary libs
-find . \( -name "*.jar" -o -name "*.class" \) | xargs -t %{__rm} -f
-%if ! %{with_jboss4}
-rm -r src/com/mysql/jdbc/integration/jboss/
-rm -r src/testsuite/regression/DataSourceRegressionTest.java
-%endif
+%patch0 -p1
# dup
rm -f README
@@ -90,34 +79,38 @@
sed -i -e 's/.$//' README.txt
%build
-# jboss jars needed for test suite
-export CLASSPATH="$(build-classpath ant-contrib \
- commons-logging slf4j \
-%if %{with_jboss4}
- jboss4/jboss-common-jdbc-wrapper \
-%endif
- jdbc-stdext jta \
- junit log4j xml-commons-jaxp-1.3-apis)"
-ant -Dant.build.javac.source=1.6 \
- -Dant.build.javac.target=1.6 \
- -DbuildDir="%{builddir}" \
- -DdistDir="%{distdir}" \
+
+# disable jboss integration
+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
+
+export CLASSPATH=$(build-classpath \
+ ant-contrib \
+ commons-logging \
+ slf4j \
+ jdbc-stdext\
+ jta \
+ junit \
+ log4j)
+
+# we need jdk5 for jdbc3.0
+# XXX: JAVA_HOME must be setup **after** CLASSPATH
+export JAVA_HOME=%{_libdir}/jvm/java-1.5.0-gcj
+ant -DbuildDir=build-mysql-jdbc \
+ -DdistDir=dist-mysql-jdbc \
-Dcom.mysql.jdbc.java6.javac="%{javac}" \
- -Dcom.mysql.jdbc.java6.rtjar="%{java_home}/jre/lib/rt.jar" \
- dist
+ -Dcom.mysql.jdbc.java6.java="%{java}" \
+ -Dcom.mysql.jdbc.java6.rtjar"=%{java_home}/jre/lib/rt.jar"
%install
install -d -m 755 %{buildroot}%{_javadir}
install
./build-mysql-jdbc/%{name}-%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT-bin.jar
\
- %{buildroot}%{_javadir}/%{name}-%{version}.jar
+ %{buildroot}%{_javadir}/%{name}.jar
-(
- cd %{buildroot}%{_javadir} && \
- for jar in *-%{version}*.jar; do
- %{__ln_s} -f ${jar} `echo $jar | %{__sed} "s|-%{version}||g"`
- done
-)
rm -rf %{buildroot}%{name}-%{version}/docs/release-test-output
# Install the Maven build information
@@ -127,13 +120,19 @@
%add_to_maven_depmap mysql %{name} %{version} JPP %{name}
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
%clean
%{__rm} -rf $RPM_BUILD_ROOT
%files
%defattr(0644,root,root,0755)
-%doc CHANGES COPYING
-%attr(0644,root,root) %{_javadir}/*.jar
+%doc CHANGES COPYING README.txt
+%attr(0644,root,root) %{_javadir}/%{name}.jar
%config(noreplace) %{_mavendepmapfragdir}/*
%{_mavenpomdir}/*.pom
++++++ mysql-connector-java-5.1.6-java6-compatibility.patch ->
mysql-connector-java-5.1.19-java7.patch ++++++
++++ 1333 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/mysql-connector-java/mysql-connector-java-5.1.6-java6-compatibility.patch
++++ and
/work/SRC/openSUSE:Factory/.mysql-connector-java.new/mysql-connector-java-5.1.19-java7.patch
++++++ mysql-connector-java-5.1.19-suse.tar.xz ++++++
Files /var/tmp/diff_new_pack.hCfws8/_old and /var/tmp/diff_new_pack.hCfws8/_new
differ
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
