From 473d0198b71f8d4817289be64db3aaf257e544e8d3da4b05d9b9c2e3b0a47402 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 19 Mar 2022 21:02:33 +0000 Subject: [PATCH 1/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=53 --- bsf-javadoc.patch | 123 ++++++++++++++++++++++++++++++++++++++++++++++ bsf.spec | 4 +- 2 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 bsf-javadoc.patch diff --git a/bsf-javadoc.patch b/bsf-javadoc.patch new file mode 100644 index 0000000..ea94aed --- /dev/null +++ b/bsf-javadoc.patch @@ -0,0 +1,123 @@ +--- bsf-2.4.0/src/org/apache/bsf/BSFEngine.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/BSFEngine.java 2022-03-19 21:59:41.811383819 +0100 +@@ -114,7 +114,7 @@ + /** + * This is used by an application to compile a value-returning expression. + * The expr may be string or some other type, depending on the language. +- * The generated code is dumped into the CodeBuffer. ++ * The generated code is dumped into the CodeBuffer. + * + * @param source (context info) the source of this expression + * (e.g., filename) +@@ -136,7 +136,7 @@ + /** + * This is used by an application to compile some script. The + * script may be string or some other type, depending on the +- * language. The generated code is dumped into the CodeBuffer. ++ * language. The generated code is dumped into the CodeBuffer. + * + * @param source (context info) the source of this script + * (e.g., filename) +--- bsf-2.4.0/src/org/apache/bsf/BSFManager.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/BSFManager.java 2022-03-19 22:00:25.391638418 +0100 +@@ -228,7 +228,7 @@ + + /** + * Compile the application of the given anonymous function of the given +- * language to the given parameters into the given CodeBuffer. ++ * language to the given parameters into the given CodeBuffer. + * + * @param lang language identifier + * @param source (context info) the source of this expression +@@ -279,7 +279,7 @@ + + /** + * Compile the given expression of the given language into the given +- * CodeBuffer. ++ * CodeBuffer. + * + * @param lang language identifier + * @param source (context info) the source of this expression +@@ -322,7 +322,7 @@ + + /** + * Compile the given script of the given language into the given +- * CodeBuffer. ++ * CodeBuffer. + * + * @param lang language identifier + * @param source (context info) the source of this script +--- bsf-2.4.0/src/org/apache/bsf/engines/javascript/JavaScriptEngine.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/engines/javascript/JavaScriptEngine.java 2022-03-19 21:54:50.465693150 +0100 +@@ -41,7 +41,7 @@ + * The original version of this code was first written by Adam Peller + * for use in LotusXSL. Sanjiva took his code and adapted it for BSF. + * +- * @author Adam Peller ++ * @author Adam Peller <peller@lotus.com> + * @author Sanjiva Weerawarana + * @author Matthew J. Duftler + * @author Norris Boyd +--- bsf-2.4.0/src/org/apache/bsf/util/BSFEngineImpl.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/util/BSFEngineImpl.java 2022-03-19 21:55:30.569919997 +0100 +@@ -28,7 +28,6 @@ + * This is a base implementation of the BSFEngine interface which + * engine implementations may choose to extend to get the basic + * methods of the interface implemented. +- *

+ * + * @author Sanjiva Weerawarana + * @author Olivier Gruber (added original debugging support) +--- bsf-2.4.0/src/org/apache/bsf/util/BSFFunctions.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/util/BSFFunctions.java 2022-03-19 21:55:46.218008509 +0100 +@@ -24,7 +24,7 @@ + * This is a utility that engine implementors may use as the Java + * object they expose in the scripting language as "bsf". This has + * essentially a subset of the methods in BSFManager plus some +- * stuff from the utils. Currently used by Javascript (Rhino) & BML. ++ * stuff from the utils. Currently used by Javascript (Rhino) & BML. + * + * @author Sanjiva Weerawarana + */ +--- bsf-2.4.0/src/org/apache/bsf/util/cf/CFDriver.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/util/cf/CFDriver.java 2022-03-19 22:02:02.892204773 +0100 +@@ -52,18 +52,18 @@ + * A driver for CodeFormatter. + *

+ * Usage: +- *

++	*

+ 	*  java org.apache.cf.CFDriver [args]
+-	*

++	*
+ 	*    args:
+-	*

++	*
+ 	*      [-in      fileName]   default: <STDIN>
+ 	*      [-out     fileName]   default: <STDOUT>
+ 	*      [-maxLine   length]   default: 74
+ 	*      [-step        size]   default: 2
+ 	*      [-delim      group]   default: (+
+ 	*      [-sdelim     group]   default: ,
+-	*

++	*
+ */ + public static void main(String[] argv) + { +--- bsf-2.4.0/src/org/apache/bsf/util/event/EventAdapterRegistry.java 2022-03-19 21:53:07.721111965 +0100 ++++ bsf-2.4.0/src/org/apache/bsf/util/event/EventAdapterRegistry.java 2022-03-19 21:59:08.155186817 +0100 +@@ -30,12 +30,11 @@ + * and if it doesn't find one looks for a standard implementation of + * that adapter in the org.apache.bsf.util.event.adapters package with a + * standard naming convention. The naming convention it assumes is the +- * following: for event listener type a.b.c.FooListener, ++ * following: for event listener type a.b.c.FooListener, + * it loads an adapter of type +- * org.apache.bsf.util.event.adapters.a_b_c_FooAdapter. ++ * org.apache.bsf.util.event.adapters.a_b_c_FooAdapter. + * If both the loading and the dynamic generation fail, then a + * null is returned. +- *

+ * + * @author Sanjiva Weerawarana + * @author Matthew J. Duftler diff --git a/bsf.spec b/bsf.spec index cad6b37..ddc7498 100644 --- a/bsf.spec +++ b/bsf.spec @@ -1,7 +1,7 @@ # # spec file for package bsf # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ Source1000: http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{vers Source1001: bsf.keyring Patch0: build-file.patch Patch1: build.properties.patch +Patch2: bsf-javadoc.patch BuildRequires: ant BuildRequires: apache-commons-logging BuildRequires: fdupes @@ -85,6 +86,7 @@ Framework. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 find -name \*.jar -delete %build From 34da1901d37cabacb032901f9033b4561639b463cc50aef14cc69fd0669ff62c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 19 Mar 2022 21:03:56 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=54 --- bsf.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bsf.changes b/bsf.changes index 8e974db..dcaef35 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 19 21:03:11 UTC 2022 - Fridrich Strba + +- Added patch: + * bsf-javadoc.patch + + fix build with javadoc 17 that produces html5 + ------------------------------------------------------------------- Wed Jan 8 07:30:23 UTC 2020 - Fridrich Strba From 9eed5ae1c7a3826ef97f1d52301e951e7894e40922f000c16a2663031c5b6f20 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 20 Mar 2022 07:32:03 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=55 --- bsf-javadoc.patch | 123 ---------------------------------------------- bsf.changes | 7 --- bsf.spec | 2 - 3 files changed, 132 deletions(-) diff --git a/bsf-javadoc.patch b/bsf-javadoc.patch index ea94aed..473a0f4 100644 --- a/bsf-javadoc.patch +++ b/bsf-javadoc.patch @@ -1,123 +0,0 @@ ---- bsf-2.4.0/src/org/apache/bsf/BSFEngine.java 2022-03-19 21:53:07.721111965 +0100 -+++ bsf-2.4.0/src/org/apache/bsf/BSFEngine.java 2022-03-19 21:59:41.811383819 +0100 -@@ -114,7 +114,7 @@ - /** - * This is used by an application to compile a value-returning expression. - * The expr may be string or some other type, depending on the language. -- * The generated code is dumped into the CodeBuffer. -+ * The generated code is dumped into the CodeBuffer. - * - * @param source (context info) the source of this expression - * (e.g., filename) -@@ -136,7 +136,7 @@ - /** - * This is used by an application to compile some script. The - * script may be string or some other type, depending on the -- * language. The generated code is dumped into the CodeBuffer. -+ * language. The generated code is dumped into the CodeBuffer. - * - * @param source (context info) the source of this script - * (e.g., filename) ---- bsf-2.4.0/src/org/apache/bsf/BSFManager.java 2022-03-19 21:53:07.721111965 +0100 -+++ bsf-2.4.0/src/org/apache/bsf/BSFManager.java 2022-03-19 22:00:25.391638418 +0100 -@@ -228,7 +228,7 @@ - - /** - * Compile the application of the given anonymous function of the given -- * language to the given parameters into the given CodeBuffer. -+ * language to the given parameters into the given CodeBuffer. - * - * @param lang language identifier - * @param source (context info) the source of this expression -@@ -279,7 +279,7 @@ - - /** - * Compile the given expression of the given language into the given -- * CodeBuffer. -+ * CodeBuffer. - * - * @param lang language identifier - * @param source (context info) the source of this expression -@@ -322,7 +322,7 @@ - - /** - * Compile the given script of the given language into the given -- * CodeBuffer. -+ * CodeBuffer. - * - * @param lang language identifier - * @param source (context info) the source of this script ---- bsf-2.4.0/src/org/apache/bsf/engines/javascript/JavaScriptEngine.java 2022-03-19 21:53:07.721111965 +0100 -+++ bsf-2.4.0/src/org/apache/bsf/engines/javascript/JavaScriptEngine.java 2022-03-19 21:54:50.465693150 +0100 -@@ -41,7 +41,7 @@ - * The original version of this code was first written by Adam Peller - * for use in LotusXSL. Sanjiva took his code and adapted it for BSF. - * -- * @author Adam Peller -+ * @author Adam Peller <peller@lotus.com> - * @author Sanjiva Weerawarana - * @author Matthew J. Duftler - * @author Norris Boyd ---- bsf-2.4.0/src/org/apache/bsf/util/BSFEngineImpl.java 2022-03-19 21:53:07.721111965 +0100 -+++ bsf-2.4.0/src/org/apache/bsf/util/BSFEngineImpl.java 2022-03-19 21:55:30.569919997 +0100 -@@ -28,7 +28,6 @@ - * This is a base implementation of the BSFEngine interface which - * engine implementations may choose to extend to get the basic - * methods of the interface implemented. -- *

- * - * @author Sanjiva Weerawarana - * @author Olivier Gruber (added original debugging support) ---- bsf-2.4.0/src/org/apache/bsf/util/BSFFunctions.java 2022-03-19 21:53:07.721111965 +0100 -+++ bsf-2.4.0/src/org/apache/bsf/util/BSFFunctions.java 2022-03-19 21:55:46.218008509 +0100 -@@ -24,7 +24,7 @@ - * This is a utility that engine implementors may use as the Java - * object they expose in the scripting language as "bsf". This has - * essentially a subset of the methods in BSFManager plus some -- * stuff from the utils. Currently used by Javascript (Rhino) & BML. -+ * stuff from the utils. Currently used by Javascript (Rhino) & BML. - * - * @author Sanjiva Weerawarana - */ ---- bsf-2.4.0/src/org/apache/bsf/util/cf/CFDriver.java 2022-03-19 21:53:07.721111965 +0100 -+++ bsf-2.4.0/src/org/apache/bsf/util/cf/CFDriver.java 2022-03-19 22:02:02.892204773 +0100 -@@ -52,18 +52,18 @@ - * A driver for CodeFormatter. - *

- * Usage: -- *

-+	*

- 	*  java org.apache.cf.CFDriver [args]
--	*

-+	*
- 	*    args:
--	*

-+	*
- 	*      [-in      fileName]   default: <STDIN>
- 	*      [-out     fileName]   default: <STDOUT>
- 	*      [-maxLine   length]   default: 74
- 	*      [-step        size]   default: 2
- 	*      [-delim      group]   default: (+
- 	*      [-sdelim     group]   default: ,
--	*

-+	*
- */ - public static void main(String[] argv) - { ---- bsf-2.4.0/src/org/apache/bsf/util/event/EventAdapterRegistry.java 2022-03-19 21:53:07.721111965 +0100 -+++ bsf-2.4.0/src/org/apache/bsf/util/event/EventAdapterRegistry.java 2022-03-19 21:59:08.155186817 +0100 -@@ -30,12 +30,11 @@ - * and if it doesn't find one looks for a standard implementation of - * that adapter in the org.apache.bsf.util.event.adapters package with a - * standard naming convention. The naming convention it assumes is the -- * following: for event listener type a.b.c.FooListener, -+ * following: for event listener type a.b.c.FooListener, - * it loads an adapter of type -- * org.apache.bsf.util.event.adapters.a_b_c_FooAdapter. -+ * org.apache.bsf.util.event.adapters.a_b_c_FooAdapter. - * If both the loading and the dynamic generation fail, then a - * null is returned. -- *

- * - * @author Sanjiva Weerawarana - * @author Matthew J. Duftler diff --git a/bsf.changes b/bsf.changes index dcaef35..8e974db 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Sat Mar 19 21:03:11 UTC 2022 - Fridrich Strba - -- Added patch: - * bsf-javadoc.patch - + fix build with javadoc 17 that produces html5 - ------------------------------------------------------------------- Wed Jan 8 07:30:23 UTC 2020 - Fridrich Strba diff --git a/bsf.spec b/bsf.spec index ddc7498..c43c3a5 100644 --- a/bsf.spec +++ b/bsf.spec @@ -29,7 +29,6 @@ Source1000: http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{vers Source1001: bsf.keyring Patch0: build-file.patch Patch1: build.properties.patch -Patch2: bsf-javadoc.patch BuildRequires: ant BuildRequires: apache-commons-logging BuildRequires: fdupes @@ -86,7 +85,6 @@ Framework. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 find -name \*.jar -delete %build From d4a3a5e7aff370f8c3de84d9c3a7058300d84a9e5b8c037884c78cbb0f042a41 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 20 Mar 2022 07:32:16 +0000 Subject: [PATCH 4/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=56 --- bsf-javadoc.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bsf-javadoc.patch diff --git a/bsf-javadoc.patch b/bsf-javadoc.patch deleted file mode 100644 index 473a0f4..0000000 From 524f2a8e429436795276dfa5c096aa5c4f5601e32585dfce1975959a5dc4b505 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 23 Mar 2022 23:14:24 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=57 --- bsf.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bsf.spec b/bsf.spec index c43c3a5..cad6b37 100644 --- a/bsf.spec +++ b/bsf.spec @@ -1,7 +1,7 @@ # # spec file for package bsf # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From e5233288234eff6346edec1a6de1dba3772350e690b8edb263ccd00d53696ffb Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 08:28:09 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=58 --- bsf.changes | 5 +++++ bsf.spec | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/bsf.changes b/bsf.changes index 8e974db..46d119f 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 08:27:05 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Wed Jan 8 07:30:23 UTC 2020 - Fridrich Strba diff --git a/bsf.spec b/bsf.spec index cad6b37..99d9ffa 100644 --- a/bsf.spec +++ b/bsf.spec @@ -1,7 +1,7 @@ # # spec file for package bsf # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Release: 0 Summary: Bean Scripting Framework License: Apache-2.0 Group: Development/Libraries/Java -URL: http://commons.apache.org/bsf/ +URL: https://commons.apache.org/bsf/ Source0: http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{version}.tar.gz Source1: bsf-pom.xml Source1000: http://www.apache.org/dist/commons/bsf/source/%{name}-src-%{version}.tar.gz.asc @@ -33,11 +33,10 @@ BuildRequires: ant BuildRequires: apache-commons-logging BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: rhino BuildRequires: xalan-j2 #!BuildIgnore: jline1 -Requires: mvn(commons-logging:commons-logging) BuildArch: noarch %description @@ -99,7 +98,8 @@ install -m 644 build/lib/%{name}.jar \ %{buildroot}%{_javadir}/%{name}.jar # pom and depmap frag -install -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.bsf:%{name}" # javadoc From 7dbd263d0ba24204fc3d0b8a22aa07841e124929951f1c95088a5d90f9e89659 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 08:55:07 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=59 --- bsf.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bsf.spec b/bsf.spec index 99d9ffa..41f8149 100644 --- a/bsf.spec +++ b/bsf.spec @@ -82,8 +82,8 @@ Framework. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 find -name \*.jar -delete %build