OBS User unknown 2008-08-07 09:59:22 +00:00 committed by Git OBS Bridge
parent 605edc7388
commit 0e23ffcd8f
9 changed files with 1904 additions and 104 deletions

View File

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

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:21573cd86a4bad30a914760fea995082fb2643e65382580ca8cd2acde3605cb0
size 8516069

View File

@ -0,0 +1,68 @@
--- 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,58 +0,0 @@
diff -Naur ../mysql-connector-java-3.1.12.orig/build.xml ./build.xml
--- ../mysql-connector-java-3.1.12.orig/build.xml 2005-12-01 03:02:01.000000000 +0100
+++ ./build.xml 2006-09-27 15:39:20.000000000 +0200
@@ -536,7 +536,9 @@
debug="${debug.enable}"
excludes="testsuite/**,
com/mysql/jdbc/integration/**,
- com/mysql/jdbc/log/Log4JLogger.java">
+ com/mysql/jdbc/log/Log4JLogger.java"
+ source="1.4"
+ target="1.4" >
<classpath refid="project.build.classpath" />
</javac>
</target>
@@ -578,7 +580,9 @@
destdir="${buildDir}/${fullProdName}"
deprecation="off"
debug="${debug.enable}"
- includes="com/mysql/jdbc/integration/c3p0/**">
+ includes="com/mysql/jdbc/integration/c3p0/**"
+ source="1.4"
+ target="1.4" >
<classpath refid="project.build.classpath" />
</javac>
</target>
@@ -590,7 +594,9 @@
destdir="${buildDir}/${fullProdName}"
deprecation="off"
debug="${debug.enable}"
- includes="com/mysql/jdbc/integration/jboss/**">
+ includes="com/mysql/jdbc/integration/jboss/**"
+ source="1.4"
+ target="1.4">
<classpath refid="project.build.classpath" />
</javac>
</target>
@@ -602,7 +608,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.4"
+ target="1.4">
<classpath refid="project.build.classpath" />
</javac>
</target>
@@ -616,7 +624,9 @@
deprecation="off"
debug="${debug.enable}"
includes="testsuite/**"
- excludes="testsuite/requiresNonRedists/**">
+ excludes="testsuite/requiresNonRedists/**"
+ source="1.4"
+ target="1.4">
<classpath refid="project.build.classpath"/>
</javac>
</target>

View File

@ -0,0 +1,34 @@
--- build.xml
+++ build.xml
@@ -361,7 +361,7 @@
</if>
</target>
- <target name="dist" depends="init, compile">
+ <target name="dist" depends="init, compile, javadoc">
<delete file="${buildDir}/${fullProdName}-bin.jar" />
<delete file="${distDir}/${fullProdName}.jar" />
@@ -1175,4 +1175,22 @@
</sequential>
</for>
</target>
+ <target name="javadoc"
+ description="Creates the API documentation">
+ <mkdir dir="${buildDir}/javadoc"/>
+ <javadoc packagenames="com.mysql.jdbc.*,org.gjt.mm.mysql.*"
+ sourcepath="${sourceDir}"
+ destdir="${buildDir}/javadoc"
+ author="true"
+ version="true"
+ use="true"
+ splitindex="true"
+ noindex="false"
+ windowtitle="MySQL Connector/J v${version}"
+ doctitle="MySQL Connector/J v${version}&lt;br&gt;API Specification"
+ header="&lt;b&gt;MySQL Connector/J size='-1'&gt;${version}&lt;/font&gt;&lt;/b&gt;">
+ <classpath refid="project.build.classpath" />
+ </javadoc>
+ </target>
+
</project>

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Aug 7 09:46:22 CEST 2008 - mvyskocil@suse.cz
- update to the 5.0.8 (improved spec from jpackage.org)
- fix of [bnc#99151]
- added two new subpackages (javadoc and manual)
- removed the dependency on jboss4
- add a support for build with java6 and java5 together (ia64 build fix)
- use source="1.5" and target="1.5"
-------------------------------------------------------------------
Thu Jul 17 07:54:00 CEST 2008 - coolo@suse.de

View File

@ -1,41 +1,53 @@
#
# spec file for package mysql-connector-java (Version 3.1.12)
# spec file for package mysql-connector-java (Version 5.0.8)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
# icecream 0
%define section free
%define builddir build-mysql-jdbc
%define distdir dist-mysql-jdbc
%define with_jboss4 0
Name: mysql-connector-java
%define builddir build-mysql-jdbc
%define distdir dist-mysql-jdbc
Summary: Official JDBC Driver for MySQL
BuildRequires: ant java2-devel-packages jta junit log4j-mini
Version: 3.1.12
Release: 265
Version: 5.0.8
Release: 1
License: GPL v2 or later
Group: Development/Libraries/Java
Source0: %{name}-%{version}.tar.gz
Patch0: patch-build.xml
Patch1: %{name}-java14compat.patch
Source0: %{name}-%{version}.tar.bz2
Patch0: %{name}-build_xml.patch
Patch1: %{name}-target-javadoc.patch
Patch2: %{name}-%{version}-java6-compatibility.patch
Url: http://www.mysql.com/downloads/api-jdbc-stable.html
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Requires: jta >= 1.0.1-0.a.1
BuildRequires: ant
BuildRequires: ant-contrib
BuildRequires: java-devel
BuildRequires: jakarta-commons-logging
%if %{with_jboss4}
BuildRequires: jboss4-common
BuildRequires: jboss4-connector
%endif
BuildRequires: jpackage-utils
BuildRequires: junit
BuildRequires: log4j-mini
Requires: log4j
#BuildRequires: ant >= 1.6.0
#BuildRequires: ant-contrib
#BuildRequires: java-devel >= 1.4.0
#BuildRequires: jpackage-utils >= 1.6
#BuildRequires: jta >= 1.0.1-0.a.1
#BuildRequires: junit
#BuildRequires: log4j
Provides: mm.mysql
Obsoletes: mm.mysql
@ -50,32 +62,120 @@ set that supports the capabilities of MySQL.
%package javadoc
License: GPL v2 or later
Summary: Official JDBC Driver for MySQL
Group: Development/Libraries/Java
Requires(post): /bin/ln
Requires(post): /bin/rm
Requires(postun): /bin/rm
%description javadoc
MySQL Connector/J is a native Java driver that converts JDBC (Java
Database Connectivity) calls into the network protocol used by the
MySQL database. It lets developers working with the Java programming
language easily build programs and applets that interact with MySQL and
connect all corporate data, even in a heterogeneous environment. MySQL
Connector/J is a Type IV JDBC driver and has a complete JDBC feature
set that supports the capabilities of MySQL.
%package manual
License: GPL v2 or later
Summary: Official JDBC Driver for MySQL
Group: Development/Libraries/Java
Requires(post): /bin/ln
Requires(post): /bin/rm
Requires(postun): /bin/rm
%description manual
MySQL Connector/J is a native Java driver that converts JDBC (Java
Database Connectivity) calls into the network protocol used by the
MySQL database. It lets developers working with the Java programming
language easily build programs and applets that interact with MySQL and
connect all corporate data, even in a heterogeneous environment. MySQL
Connector/J is a Type IV JDBC driver and has a complete JDBC feature
set that supports the capabilities of MySQL.
%prep
%setup -q -n %{name}-%{version}
%patch0
%patch1
%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
# remove all binary libs
find . \( -name "*.jar" -o -name "*.class" \) | xargs -t rm -f
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
# duplicate-waste
rm docs/README.txt README
# wrong end of line necoding
sed -i -e 's/.$//' README.txt EXCEPTIONS-CONNECTOR-J
%build
export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j)
ant -DbuildDir=%{builddir} -DdistDir=%{distdir}
# jboss jars needed for test suite
export CLASSPATH="$(build-classpath ant-contrib \
jakarta-commons-logging \
%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.5 \
-Dant.build.javac.target=1.5 \
-DbuildDir="%{builddir}" \
-DdistDir="%{distdir}" \
dist javadoc
%install
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 %{builddir}/%{name}-%{version}/%{name}-%{version}-bin.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir}
%{__install} -m 644 %{builddir}/%{name}-%{version}/%{name}-%{version}-bin.jar \
${RPM_BUILD_ROOT}%{_javadir}/%{name}-%{version}.jar
(
cd ${RPM_BUILD_ROOT}%{_javadir} && \
for jar in *-%{version}*.jar; do
%{__ln_s} -f ${jar} `echo $jar | %{__sed} "s|-%{version}||g"`
done
)
%{__rm} -rf ${RPM_BUILD_DIR}%{name}-%{version}/docs/release-test-output
# javadoc
%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version}
%{__cp} -pr build-mysql-jdbc/javadoc/* \
${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version}
%{__ln_s} %{name}-%{version} ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%{__rm} -rf $RPM_BUILD_ROOT
%files
%defattr(0644,root,root,0755)
%doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README README.txt docs
%doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README.txt
%attr(0644,root,root) %{_javadir}/*.jar
%files manual
%defattr(0644,root,root,0755)
%doc docs
%files javadoc
%defattr(0644,root,root,0755)
%ghost %doc %{_javadocdir}/%{name}
%doc %{_javadocdir}/%{name}-%{version}
%changelog
* Thu Aug 07 2008 mvyskocil@suse.cz
- update to the 5.0.8 (improved spec from jpackage.org)
- fix of [bnc#99151]
- added two new subpackages (javadoc and manual)
- removed the dependency on jboss4
- add a support for build with java6 and java5 together (ia64 build fix)
- use source="1.5" and target="1.5"
* Thu Jul 17 2008 coolo@suse.de
- trying to avoid another build cycle
* Wed Sep 27 2006 skh@suse.de

View File

@ -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 @@
</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>