Accepting request 673637 from Java:packages

Fix dependencies + speed-up the build a bit

OBS-URL: https://build.opensuse.org/request/show/673637
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rhino?expand=0&rev=34
This commit is contained in:
Stephan Kulow 2019-02-24 16:03:36 +00:00 committed by Git OBS Bridge
commit 09a8d38a82
2 changed files with 8 additions and 5 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Feb 12 11:06:56 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Do not buildrequire jline, since it is only runtime dependency
- Do not run ant with -v and -d options during the product build
-------------------------------------------------------------------
Sun Nov 18 16:32:33 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package rhino
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@ -50,7 +50,6 @@ BuildRequires: ant
BuildRequires: bea-stax-api
BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-local
BuildRequires: jline
BuildRequires: xmlbeans-mini
#!BuildIgnore: antlr
#!BuildIgnore: antlr-java
@ -101,9 +100,7 @@ sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date
%patch100 -b .gjc
%build
export CLASSPATH=$(build-classpath jline)
export OPT_JAR_LIST=:
%{ant} -v -d \
%{ant} \
-Dxbean.jar=$(build-classpath xmlbeans/xbean | cut -d ':' -f 1) \
-Djsr173.jar=$(build-classpath bea-stax-api) \
-Dtarget-jvm=6 -Dsource-level=6 \