From b66aa70ad3f6993378211e915515a7a38c45916e04913bc23f5215ff0caf6fa6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 12 Feb 2019 16:30:31 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/rhino?expand=0&rev=44 --- rhino-jsc.script | 2 +- rhino.script | 2 +- rhino.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rhino-jsc.script b/rhino-jsc.script index 419a2ee..59a25af 100644 --- a/rhino-jsc.script +++ b/rhino-jsc.script @@ -18,7 +18,7 @@ fi # Configuration MAIN_CLASS=org.mozilla.javascript.tools.jsc.Main -BASE_FLAGS="-Xbootclasspath/p:$(build-classpath rhino xmlbeans/xbean)" +BASE_FLAGS="-Xbootclasspath/p:$(build-classpath rhino1 xmlbeans/xbean)" BASE_JARS="rhino xmlbeans/xbean" # Set parameters diff --git a/rhino.script b/rhino.script index 12c1507..e19c1e0 100644 --- a/rhino.script +++ b/rhino.script @@ -18,7 +18,7 @@ fi # Configuration MAIN_CLASS=org.mozilla.javascript.tools.shell.Main -BASE_FLAGS="-Xbootclasspath/p:$(build-classpath rhino jline xmlbeans/xbean)" +BASE_FLAGS="-Xbootclasspath/p:$(build-classpath rhino jline1 xmlbeans/xbean)" BASE_JARS="rhino jline xmlbeans/xbean" # Set parameters diff --git a/rhino.spec b/rhino.spec index d963393..83ede29 100644 --- a/rhino.spec +++ b/rhino.spec @@ -60,7 +60,7 @@ BuildRequires: xmlbeans-mini #!BuildIgnore: xml-commons-jaxp-1.3-apis #!BuildIgnore: xml-commons-resolver Requires: bea-stax-api -Requires: jline +Requires: jline1 Requires: xmlbeans BuildArch: noarch From 1927494e6822359a9b52b280faabc8042a5739bd952768d0b4a9fbb88c439468 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 2 Mar 2019 13:08:43 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/rhino?expand=0&rev=46 --- rhino.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rhino.changes b/rhino.changes index 8b2efc8..a25a1e0 100644 --- a/rhino.changes +++ b/rhino.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 2 13:08:27 UTC 2019 - Fridrich Strba + +- Build against jline1, a compatibility package + ------------------------------------------------------------------- Tue Feb 12 11:06:56 UTC 2019 - Fridrich Strba