From 6f2e2e44e788dd1a6f19de27c92d40182bf2c2b4 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 20 Jul 2020 21:59:04 +0200 Subject: [PATCH] adaptations for Java 11 compatibility --- bsf.spec | 10 ++-- build-file.patch | 33 ------------ build.properties.patch | 47 ----------------- java-11-fixes.patch | 117 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 123 insertions(+), 84 deletions(-) delete mode 100644 build-file.patch delete mode 100644 build.properties.patch create mode 100644 java-11-fixes.patch diff --git a/bsf.spec b/bsf.spec index e76809e..41da304 100644 --- a/bsf.spec +++ b/bsf.spec @@ -1,7 +1,7 @@ Name: bsf Epoch: 0 Version: 2.4.0 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Bean Scripting Framework License: ASL 2.0 URL: http://commons.apache.org/bsf/ @@ -10,8 +10,7 @@ BuildArch: noarch Source0: http://apache.mirror.anlx.net//commons/%{name}/source/%{name}-src-%{version}.tar.gz Source1: %{name}-pom.xml -Patch0: build-file.patch -Patch1: build.properties.patch +Patch0: java-11-fixes.patch BuildRequires: javapackages-local BuildRequires: ant @@ -54,7 +53,7 @@ Javadoc for %{name}. %prep %setup -q %patch0 -p1 -%patch1 -p1 + find -name \*.jar -delete %mvn_file : %{name} @@ -77,6 +76,9 @@ ant jar javadocs %license LICENSE.txt NOTICE.txt %changelog +* Mon Jul 20 2020 Fabio Valentini - 0:2.4.0-37 +- Adaptations for Java 11 compatibility. + * Fri Jul 10 2020 Jiri Vanek - 0:2.4.0-36 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 diff --git a/build-file.patch b/build-file.patch deleted file mode 100644 index 87b2c2b..0000000 --- a/build-file.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 -@@ -102,7 +102,7 @@ - - - -- -+ - - - -@@ -134,11 +134,13 @@ - - - -+ - - - -@@ -268,6 +270,7 @@ - - - -+ - - - diff --git a/build.properties.patch b/build.properties.patch deleted file mode 100644 index 3ea3f72..0000000 --- a/build.properties.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --new-file -r -u bsf-2.4.0-orig/build-properties.xml bsf-2.4.0/build-properties.xml ---- bsf-2.4.0-orig/build-properties.xml 1970-01-01 01:00:00.000000000 +0100 -+++ bsf-2.4.0/build-properties.xml 2007-05-23 15:33:04.000000000 +0200 -@@ -0,0 +1,43 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ diff --git a/java-11-fixes.patch b/java-11-fixes.patch new file mode 100644 index 0000000..043c7e5 --- /dev/null +++ b/java-11-fixes.patch @@ -0,0 +1,117 @@ +diff --git a/build-properties.xml b/build-properties.xml +new file mode 100644 +index 0000000..18d14cc +--- /dev/null ++++ b/build-properties.xml +@@ -0,0 +1,44 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/build.xml b/build.xml +index 39d31e1..1792f70 100644 +--- a/build.xml ++++ b/build.xml +@@ -102,7 +102,7 @@ Copyright: + + + +- ++ + + + +@@ -134,11 +134,13 @@ Copyright: + + + ++ + + + +@@ -214,7 +216,7 @@ Copyright: + + + +- ++ + + + +@@ -256,9 +258,9 @@ Copyright: + + + +- +- +- ++ ++ ++ + + + +@@ -268,7 +270,7 @@ Copyright: + + + +- ++ + + + +@@ -375,7 +377,7 @@ Copyright: + + + +- ++ + + +