From e1f41462f5374eb46fef71336b217c3bf9d5ebd108146632d9a30044e24fd8ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 13 May 2015 17:29:13 +0000
Subject: [PATCH] - Add new patch to build tests:   *
 use-classpath-in-tests.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=25
---
 mysql-connector-java.changes |  2 ++
 mysql-connector-java.spec    |  3 +++
 use-classpath-in-tests.patch | 12 ++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 use-classpath-in-tests.patch

diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes
index f236428..3a137cb 100644
--- a/mysql-connector-java.changes
+++ b/mysql-connector-java.changes
@@ -14,6 +14,8 @@ Tue Apr 21 15:22:44 UTC 2015 - tchvatal@suse.com
   * no-jdk5-requirement.patch
 - Add and rebase jdbc4.1 patch:
   * mysql-connector-java-jdbc-4.1.patch
+- Add new patch to build tests:
+  * use-classpath-in-tests.patch
 
 -------------------------------------------------------------------
 Wed Mar 18 09:46:18 UTC 2015 - tchvatal@suse.com
diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index ed02712..0416ddc 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -35,6 +35,8 @@ Patch1:         extra-libs-build.patch
 Patch2:         no-jdk5-requirement.patch
 # PATCH-FIX-UPSTREAM: build with jdbc4.1 and also with new javac
 Patch3:         mysql-connector-java-jdbc-4.1.patch
+# PATCH-FIX-UPSTREAM: do not lose classpath during tests build
+Patch4:         use-classpath-in-tests.patch
 BuildRequires:  ant
 BuildRequires:  ant-contrib
 BuildRequires:  apache-commons-logging
@@ -71,6 +73,7 @@ set that supports the capabilities of MySQL.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # dup
 rm -f README
diff --git a/use-classpath-in-tests.patch b/use-classpath-in-tests.patch
new file mode 100644
index 0000000..d299917
--- /dev/null
+++ b/use-classpath-in-tests.patch
@@ -0,0 +1,12 @@
+Index: mysql-connector-java-5.1.35/build.xml
+===================================================================
+--- mysql-connector-java-5.1.35.orig/build.xml
++++ mysql-connector-java-5.1.35/build.xml
+@@ -191,6 +191,7 @@ com.mysql.jdbc.noCleanBetweenCompiles=ye
+         </fileset>
+ 
+         <pathelement location="${buildDir}/${fullProdName}" />
++        <pathelement path="${java.class.path}" />
+     </path>
+ 
+