From 782deef3e0745e3b24ee519ed4e22180a66584ad1375106c44835363cb8588b7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 27 Nov 2018 09:13:23 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=40 --- bsf.changes | 5 +++++ bsf.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bsf.changes b/bsf.changes index b32233a..6f4217a 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 27 09:13:05 UTC 2018 - Fridrich Strba + +- Fix build of script providers + ------------------------------------------------------------------- Wed May 16 05:52:07 UTC 2018 - fstrba@suse.com diff --git a/bsf.spec b/bsf.spec index afc9820..f12e011 100644 --- a/bsf.spec +++ b/bsf.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -93,6 +93,7 @@ rm -fr bsf %build mkdir -p lib build-jar-repository -s -p lib apache-commons-logging rhino xalan-j2 +export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2) %{ant} -Dant.build.javac.source=8 -Dant.build.javac.target=8 jar javadocs %install From 9901e5011f3f494cafdfb74760e4b44691ef1a29606ff3d8fa2c32faf4bca048 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 27 Nov 2018 09:31:56 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=41 --- bsf.changes | 4 ++- bsf.spec | 1 - build-file.patch | 70 ++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 68 insertions(+), 7 deletions(-) diff --git a/bsf.changes b/bsf.changes index 6f4217a..e8418d5 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- Tue Nov 27 09:13:05 UTC 2018 - Fridrich Strba -- Fix build of script providers +- Modified patch: + * build-file.patch + + Fix build of script providers ------------------------------------------------------------------- Wed May 16 05:52:07 UTC 2018 - fstrba@suse.com diff --git a/bsf.spec b/bsf.spec index f12e011..aa9bdec 100644 --- a/bsf.spec +++ b/bsf.spec @@ -93,7 +93,6 @@ rm -fr bsf %build mkdir -p lib build-jar-repository -s -p lib apache-commons-logging rhino xalan-j2 -export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2) %{ant} -Dant.build.javac.source=8 -Dant.build.javac.target=8 jar javadocs %install diff --git a/build-file.patch b/build-file.patch index 7c15cfd..fc877c6 100644 --- a/build-file.patch +++ b/build-file.patch @@ -1,5 +1,6 @@ ---- bsf-2.4.0-orig/build.xml 2009-09-09 11:51:20.000000000 +0200 -+++ bsf-2.4.0/build.xml 2009-09-14 08:42:17.000000000 +0200 +diff -urEbwB bsf-2.4.0-orig/build.xml bsf-2.4.0/build.xml +--- bsf-2.4.0-orig/build.xml 2018-11-27 10:25:00.759233502 +0100 ++++ bsf-2.4.0/build.xml 2018-11-27 10:28:36.864365763 +0100 @@ -102,7 +102,7 @@ @@ -9,9 +10,68 @@ -@@ -134,11 +134,13 @@ - - +@@ -122,23 +122,61 @@ + + + +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +