From 7a4efffbdc12a12adf480c24a601ac26a6f9bc9de68b3ba636eb82495d4387f3 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 12 Feb 2019 10:57:28 +0000
Subject: [PATCH 1/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/rhino?expand=0&rev=41

---
 rhino.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/rhino.spec b/rhino.spec
index bc1209c..138f459 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
@@ -61,7 +60,6 @@ BuildRequires:  xmlbeans-mini
 #!BuildIgnore:  xml-commons-jaxp-1.3-apis
 #!BuildIgnore:  xml-commons-resolver
 Requires:       bea-stax-api
-Requires:       jline
 Requires:       xmlbeans
 BuildArch:      noarch
 
@@ -101,7 +99,7 @@ sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date
 %patch100  -b .gjc
 
 %build
-export CLASSPATH=$(build-classpath jline)
+export CLASSPATH=
 export OPT_JAR_LIST=:
 %{ant} -v -d \
     -Dxbean.jar=$(build-classpath xmlbeans/xbean | cut -d ':' -f 1) \

From f017c7d1f6f6f4010c626087b0a79c3407ac460c090976453c7ca2bc5c290069 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 12 Feb 2019 11:02:17 +0000
Subject: [PATCH 2/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/rhino?expand=0&rev=42

---
 rhino.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rhino.spec b/rhino.spec
index 138f459..494ba23 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -60,6 +60,7 @@ BuildRequires:  xmlbeans-mini
 #!BuildIgnore:  xml-commons-jaxp-1.3-apis
 #!BuildIgnore:  xml-commons-resolver
 Requires:       bea-stax-api
+Requires:       jline
 Requires:       xmlbeans
 BuildArch:      noarch
 

From 2e2dd129a2d973c8aec505ed2393d4d897a6011dd40a6aa7159d201cf20b591f Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 12 Feb 2019 11:07:50 +0000
Subject: [PATCH 3/3] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/rhino?expand=0&rev=43

---
 rhino.changes | 6 ++++++
 rhino.spec    | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

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 <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>
 
diff --git a/rhino.spec b/rhino.spec
index 494ba23..d963393 100644
--- a/rhino.spec
+++ b/rhino.spec
@@ -100,9 +100,7 @@ sed -i -e 's|^implementation.version: Rhino .* release .* \${implementation.date
 %patch100  -b .gjc
 
 %build
-export CLASSPATH=
-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 \