From b16cccdf4170781259378239005b79cbed9d29d41d38b856a944b50388d42099 Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Wed, 20 Jun 2012 08:16:01 +0000 Subject: [PATCH] - build require java-devel >= 1.6.0 as well OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=9 --- mysql-connector-java.changes | 5 +++++ mysql-connector-java.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes index a5b9042..53d083f 100644 --- a/mysql-connector-java.changes +++ b/mysql-connector-java.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 20 08:13:10 UTC 2012 - mvyskocil@suse.cz + +- build require java-devel >= 1.6.0 as well + ------------------------------------------------------------------- Mon Jun 18 13:16:57 UTC 2012 - mvyskocil@suse.cz diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 209e1b2..ddefb6d 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -42,7 +42,7 @@ BuildRequires: ant BuildRequires: ant-contrib BuildRequires: apache-commons-logging BuildRequires: java-1_5_0-gcj-compat-devel -BuildRequires: java-devel +BuildRequires: java-devel >= 1.6.0 BuildRequires: jta BuildRequires: junit BuildRequires: slf4j @@ -99,7 +99,7 @@ export CLASSPATH=$(build-classpath \ # 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 \ +ant -v -d -DbuildDir=build-mysql-jdbc \ -DdistDir=dist-mysql-jdbc \ -Dcom.mysql.jdbc.java6.javac="%{javac}" \ -Dcom.mysql.jdbc.java6.java="%{java}" \