diff --git a/rhino.changes b/rhino.changes index 9428269..8b2efc8 100644 --- a/rhino.changes +++ b/rhino.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 12 11:06:56 UTC 2019 - Fridrich Strba + +- 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 diff --git a/rhino.spec b/rhino.spec index bc1209c..d963393 100644 --- a/rhino.spec +++ b/rhino.spec @@ -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 \