Accepting request 496659 from home:DZiolkowski:branches:Java:packages

- New build dependency: javapackages-local
- cleaned spec using spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/496659
OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=40
This commit is contained in:
Tomáš Chvátal 2017-05-19 11:43:26 +00:00 committed by Git OBS Bridge
parent de088f1e50
commit 40b8356db7
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri May 19 11:34:06 UTC 2017 - dziolkowski@suse.com
- New build dependency: javapackages-local
- cleaned spec using spec-cleaner
-------------------------------------------------------------------
Thu May 18 12:40:03 UTC 2017 - tchvatal@suse.com

View File

@ -37,6 +37,7 @@ BuildRequires: ant-contrib
BuildRequires: apache-commons-logging
BuildRequires: geronimo-jta-1_1-api
BuildRequires: java-devel >= 1.8.0
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: log4j-mini
@ -78,8 +79,8 @@ sed -i -e 's/.$//' README.txt
# extra libs
mkdir -p lib
mkdir -p src/lib
ln -f -s /usr/share/java/ant/ant-contrib.jar lib/ant-contrib.jar
ln -f -s /usr/share/java/slf4j/api.jar lib/slf4j-api.jar
ln -f -s %{_datadir}/java/ant/ant-contrib.jar lib/ant-contrib.jar
ln -f -s %{_datadir}/java/slf4j/api.jar lib/slf4j-api.jar
%build
# disable jboss integration
@ -101,8 +102,8 @@ export CLASSPATH=$(build-classpath \
junit \
log4j)
ant \
-Dcom.mysql.jdbc.jdk5.javac=%{javac} \
-Dcom.mysql.jdbc.jdk8.javac=%{javac} \
-Dcom.mysql.jdbc.jdk5.javac=%javac \
-Dcom.mysql.jdbc.jdk8.javac=%javac \
-Dsnapshot.version= \
-Dcom.mysql.jdbc.extra.libs=lib \
-Dant.java.version=1.5 \