OBS User unknown 2008-09-13 03:54:59 +00:00 committed by Git OBS Bridge
parent 0e23ffcd8f
commit f1de0891ae
8 changed files with 1159 additions and 1734 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21573cd86a4bad30a914760fea995082fb2643e65382580ca8cd2acde3605cb0
size 8516069

View File

@ -0,0 +1,79 @@
# This patch was taken from Debian package libmysql-java. It disables JDBC 4 support.
--- build.xml
+++ build.xml
@@ -120,9 +120,10 @@
</if>
</target>
- <target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
+ <target name="init" depends="-init-copy, -init-no-crypto">
<!-- If we're building under cruise control, update ourself -->
+ <!--
<if>
<isset property="cctimestamp"/>
<then>
@@ -131,7 +132,8 @@
</exec>
</then>
</if>
-
+ -->
+
<!-- We need the following for source distributions as there we
can't dynamically alter the classpath, and not having this
directory present causes the build to fail -->
@@ -384,7 +386,7 @@
<section name="common">
<attribute name="Specification-Title" value="JDBC" />
- <attribute name="Specification-Version" value="4.0" />
+ <attribute name="Specification-Version" value="3.0" />
<attribute name="Specification-Vendor" value="Sun Microsystems Inc." />
<attribute name="Implementation-Title" value="MySQL Connector/J" />
<attribute name="Implementation-Version" value="${full.version}" />
@@ -700,7 +702,7 @@
</target>
- <target name="compile" depends="init, compile-driver, compile-testsuite, compile.integration">
+ <target name="compile" depends="init, compile-driver, compile.integration">
</target>
<target name="compile-trace" depends="init, compile-driver-trace">
@@ -708,7 +710,7 @@
<!-- Compiles the driver itself -->
- <target name="compile-driver" depends="compile-driver-jdbc3, compile-driver-jdbc4" />
+ <target name="compile-driver" depends="compile-driver-jdbc3" />
<target name="compile-driver-jdbc3" depends="init, -clean-output">
<javac sourcepath="" srcdir="${buildDir}/${fullProdName}"
@@ -734,6 +736,8 @@
fork="yes"
executable="${com.mysql.jdbc.java6.javac}"
compiler="modern"
+ source="1.5"
+ tartget="1.5"
sourcepath="" srcdir="${buildDir}/${fullProdName}"
bootclasspath="${com.mysql.jdbc.java6.rtjar}">
<include name="**/JDBC4*.java" />
--- src/com/mysql/jdbc/Util.java
+++ src/com/mysql/jdbc/Util.java
@@ -100,7 +100,7 @@
try {
Class.forName("java.sql.NClob");
- isJdbc4 = true;
+ isJdbc4 = false;
} catch (Throwable t) {
isJdbc4 = false;
}
@@ -590,4 +590,4 @@
return extensionList;
}
-}
\ No newline at end of file
+}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78005ba6b597fe239c318ca5a1eb60f5f6fd5f25d4bfb2e8796069eac8f9981d
size 8328530

View File

@ -1,68 +0,0 @@
--- build.xml
+++ build.xml
@@ -60,10 +60,6 @@
</path>
<path id="project.build.classpath">
- <fileset dir="${buildDir}/${fullProdName}/lib-nodist">
- <include name="**/*.jar"/>
- </fileset>
-
<fileset dir="${buildDir}/${fullProdName}/lib">
<include name="**/*.jar"/>
</fileset>
@@ -652,7 +648,9 @@
debug="${debug.enable}"
excludes="testsuite/**,
com/mysql/jdbc/integration/**,
- com/mysql/jdbc/log/Log4JLogger.java">
+ com/mysql/jdbc/log/Log4JLogger.java"
+ source="1.5"
+ target="1.5">
<classpath refid="project.build.classpath" />
</javac>
</target>
@@ -694,7 +692,9 @@
destdir="${buildDir}/${fullProdName}"
deprecation="off"
debug="${debug.enable}"
- includes="com/mysql/jdbc/integration/c3p0/**">
+ includes="com/mysql/jdbc/integration/c3p0/**"
+ source="1.5"
+ target="1.5" >
<classpath refid="project.build.classpath" />
</javac>
</target>
@@ -706,7 +706,9 @@
destdir="${buildDir}/${fullProdName}"
deprecation="off"
debug="${debug.enable}"
- includes="com/mysql/jdbc/integration/jboss/**">
+ includes="com/mysql/jdbc/integration/jboss/**"
+ source="1.5"
+ target="1.5" >
<classpath refid="project.build.classpath" />
</javac>
</target>
@@ -718,7 +720,9 @@
destdir="${buildDir}/${fullProdName}"
deprecation="off"
debug="${debug.enable}"
- includes="com/mysql/jdbc/log/Log4JLogger.java">
+ includes="com/mysql/jdbc/log/Log4JLogger.java"
+ source="1.5"
+ target="1.5" >
<classpath refid="project.build.classpath" />
</javac>
</target>
@@ -732,7 +736,9 @@
deprecation="off"
debug="${debug.enable}"
includes="testsuite/**"
- excludes="testsuite/requiresNonRedists/**">
+ excludes="testsuite/requiresNonRedists/**"
+ target="1.5"
+ source="1.5" >
<classpath refid="project.build.classpath"/>
</javac>
</target>

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Sep 11 10:23:35 CEST 2008 - anosek@suse.cz
- updated to version 5.1.6
- introduces driver which conforms to the JDBC 4.0 specifications.
However this was disabled because of missing dependencies
- dropped obsoleted patch (build_xml.patch)
- added patch (disableJDBC4.patch) taken from Debian
-------------------------------------------------------------------
Thu Aug 7 09:46:22 CEST 2008 - mvyskocil@suse.cz

View File

@ -1,5 +1,5 @@
#
# spec file for package mysql-connector-java (Version 5.0.8)
# spec file for package mysql-connector-java (Version 5.1.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -25,14 +25,14 @@
Name: mysql-connector-java
Summary: Official JDBC Driver for MySQL
Version: 5.0.8
Version: 5.1.6
Release: 1
License: GPL v2 or later
Group: Development/Libraries/Java
Source0: %{name}-%{version}.tar.bz2
Patch0: %{name}-build_xml.patch
Patch1: %{name}-target-javadoc.patch
Patch2: %{name}-%{version}-java6-compatibility.patch
Patch3: %{name}-%{version}-disableJDBC4.patch
Url: http://www.mysql.com/downloads/api-jdbc-stable.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -102,12 +102,12 @@ set that supports the capabilities of MySQL.
%prep
%setup -q -n %{name}-%{version}
%patch0 -b .sav0
%patch1 -b .sav1
# patch only for javac 1.6.0
if [[ "$(javac -version 2>&1 | grep '1\.6\.0')" != "" ]]; then
%patch2 -b .sav2
fi
%patch3
# remove all binary libs
find . \( -name "*.jar" -o -name "*.class" \) | xargs -t %{__rm} -f
%if ! %{with_jboss4}
@ -132,6 +132,8 @@ ant -Dant.build.javac.source=1.5 \
-Dant.build.javac.target=1.5 \
-DbuildDir="%{builddir}" \
-DdistDir="%{distdir}" \
-Dcom.mysql.jdbc.java6.javac="%{javac}" \
-Dcom.mysql.jdbc.java6.rtjar="%{java_home}/jre/lib/rt.jar" \
dist javadoc
%install
@ -169,6 +171,12 @@ ant -Dant.build.javac.source=1.5 \
%doc %{_javadocdir}/%{name}-%{version}
%changelog
* Thu Sep 11 2008 anosek@suse.cz
- updated to version 5.1.6
- introduces driver which conforms to the JDBC 4.0 specifications.
However this was disabled because of missing dependencies
- dropped obsoleted patch (build_xml.patch)
- added patch (disableJDBC4.patch) taken from Debian
* Thu Aug 07 2008 mvyskocil@suse.cz
- update to the 5.0.8 (improved spec from jpackage.org)
- fix of [bnc#99151]