From d2a8f671896f72c65c8b66b764d7229756c0b5ae347c5e7d46d8ac7c6a2ed5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 2 Jun 2016 16:34:29 +0000 Subject: [PATCH 1/6] Accepting request 399713 from home:dimstar:Factory Fix build with newer, stricter java 1.8 OBS-URL: https://build.opensuse.org/request/show/399713 OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=22 --- bsf.changes | 6 ++++++ bsf.spec | 2 +- build-file.patch | 18 ++++++++++++++---- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/bsf.changes b/bsf.changes index 6bcb6b5..2d9a20f 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 2 15:13:38 UTC 2016 - fstrba@suse.com + +- Update build-file.patch: Disable doclint feature while building + javadoc. + ------------------------------------------------------------------- Wed Mar 25 09:24:47 UTC 2015 - tchvatal@suse.com diff --git a/bsf.spec b/bsf.spec index 47237f7..2fed31d 100644 --- a/bsf.spec +++ b/bsf.spec @@ -1,7 +1,7 @@ # # spec file for package bsf # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/build-file.patch b/build-file.patch index 7c15cfd..b2abff4 100644 --- a/build-file.patch +++ b/build-file.patch @@ -1,6 +1,8 @@ ---- 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 @@ +Index: bsf-2.4.0/build.xml +=================================================================== +--- bsf-2.4.0.orig/build.xml ++++ bsf-2.4.0/build.xml +@@ -102,7 +102,7 @@ Copyright: @@ -9,7 +11,7 @@ -@@ -134,11 +134,13 @@ +@@ -134,11 +134,13 @@ Copyright: @@ -23,3 +25,11 @@ +@@ -272,6 +274,7 @@ Copyright: + + + ++ + + + From e2b6a2d61c4acb1d47c831eefc0bba517db3848e589cdeab39793b14bd3c0280 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 3 Jun 2016 07:34:21 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=23 --- bsf.changes | 7 ++++--- bsf.spec | 4 ++++ build-file-doclint.patch | 12 ++++++++++++ build-file.patch | 8 -------- 4 files changed, 20 insertions(+), 11 deletions(-) create mode 100644 build-file-doclint.patch diff --git a/bsf.changes b/bsf.changes index 2d9a20f..d84816b 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,8 +1,9 @@ ------------------------------------------------------------------- -Thu Jun 2 15:13:38 UTC 2016 - fstrba@suse.com +Fri Jun 3 07:11:39 UTC 2016 - fstrba@suse.com -- Update build-file.patch: Disable doclint feature while building - javadoc. +- Add patch: + * build-file-doclint.patch: Disable doclint feature while + building javadoc with java-1_8_0-openjdk ------------------------------------------------------------------- Wed Mar 25 09:24:47 UTC 2015 - tchvatal@suse.com diff --git a/bsf.spec b/bsf.spec index 2fed31d..62e3f5b 100644 --- a/bsf.spec +++ b/bsf.spec @@ -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: build-file-doclint.patch BuildRequires: ant BuildRequires: apache-commons-logging BuildRequires: java-devel @@ -92,6 +93,9 @@ rm -fr bsf %patch0 -p1 %patch1 -p1 +%if 0%{?suse_version} >= 1330 +%patch2 -p1 +%endif %build [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java diff --git a/build-file-doclint.patch b/build-file-doclint.patch new file mode 100644 index 0000000..15bc5a9 --- /dev/null +++ b/build-file-doclint.patch @@ -0,0 +1,12 @@ +Index: bsf-2.4.0/build.xml +=================================================================== +--- bsf-2.4.0.orig/build.xml ++++ bsf-2.4.0/build.xml +@@ -272,6 +274,7 @@ Copyright: + + + ++ + + + diff --git a/build-file.patch b/build-file.patch index b2abff4..d44a47b 100644 --- a/build-file.patch +++ b/build-file.patch @@ -25,11 +25,3 @@ Index: bsf-2.4.0/build.xml -@@ -272,6 +274,7 @@ Copyright: - - - -+ - - - From 855fffaf3bdf3c511a03ee152cdb92f359e29ec0adaa61c84f5b841b3d5db93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 3 Jun 2016 09:23:56 +0000 Subject: [PATCH 3/6] Accepting request 399938 from Java:packages OBS-URL: https://build.opensuse.org/request/show/399938 OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=24 --- bsf.changes | 7 ------- bsf.spec | 6 +----- build-file-doclint.patch | 12 ------------ build-file.patch | 10 ++++------ 4 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 build-file-doclint.patch diff --git a/bsf.changes b/bsf.changes index d84816b..6bcb6b5 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Fri Jun 3 07:11:39 UTC 2016 - fstrba@suse.com - -- Add patch: - * build-file-doclint.patch: Disable doclint feature while - building javadoc with java-1_8_0-openjdk - ------------------------------------------------------------------- Wed Mar 25 09:24:47 UTC 2015 - tchvatal@suse.com diff --git a/bsf.spec b/bsf.spec index 62e3f5b..47237f7 100644 --- a/bsf.spec +++ b/bsf.spec @@ -1,7 +1,7 @@ # # spec file for package bsf # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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: build-file-doclint.patch BuildRequires: ant BuildRequires: apache-commons-logging BuildRequires: java-devel @@ -93,9 +92,6 @@ rm -fr bsf %patch0 -p1 %patch1 -p1 -%if 0%{?suse_version} >= 1330 -%patch2 -p1 -%endif %build [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java diff --git a/build-file-doclint.patch b/build-file-doclint.patch deleted file mode 100644 index 15bc5a9..0000000 --- a/build-file-doclint.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: bsf-2.4.0/build.xml -=================================================================== ---- bsf-2.4.0.orig/build.xml -+++ bsf-2.4.0/build.xml -@@ -272,6 +274,7 @@ Copyright: - - - -+ - - - diff --git a/build-file.patch b/build-file.patch index d44a47b..7c15cfd 100644 --- a/build-file.patch +++ b/build-file.patch @@ -1,8 +1,6 @@ -Index: bsf-2.4.0/build.xml -=================================================================== ---- bsf-2.4.0.orig/build.xml -+++ bsf-2.4.0/build.xml -@@ -102,7 +102,7 @@ Copyright: +--- 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 @@ @@ -11,7 +9,7 @@ Index: bsf-2.4.0/build.xml -@@ -134,11 +134,13 @@ Copyright: +@@ -134,11 +134,13 @@ From b3e7b143886ed4d2db14a6a384849f935a2310b6a878ceca4fef19dfeaa9eaa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 May 2017 11:43:51 +0000 Subject: [PATCH 4/6] Accepting request 496666 from home:pcervinka:branches:Java:packages - New build dependency: javapackages-local - Fixed PreReq to Requires(pre) - Spec file cleaned OBS-URL: https://build.opensuse.org/request/show/496666 OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=25 --- bsf.changes | 7 +++++++ bsf.spec | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bsf.changes b/bsf.changes index 6bcb6b5..e88168d 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 19 11:38:11 UTC 2017 - pcervinka@suse.com + +- New build dependency: javapackages-local +- Fixed PreReq to Requires(pre) +- Spec file cleaned + ------------------------------------------------------------------- Wed Mar 25 09:24:47 UTC 2015 - tchvatal@suse.com diff --git a/bsf.spec b/bsf.spec index 47237f7..8485515 100644 --- a/bsf.spec +++ b/bsf.spec @@ -1,7 +1,7 @@ # # spec file for package bsf # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,7 @@ Patch1: build.properties.patch BuildRequires: ant BuildRequires: apache-commons-logging BuildRequires: java-devel +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: jython BuildRequires: rhino @@ -66,8 +67,7 @@ In addition, the following languages are supported with their own %package javadoc Summary: Javadoc for bsf Group: Development/Libraries/Java -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: coreutils +Requires(pre): coreutils %description javadoc Bean Scripting Framework (BSF) is a set of Java classes which provides From 132751fa455c1d9daa70283a646409292a0d497a997c8eddeb5f6402c403cfeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 May 2017 11:44:48 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=26 --- bsf.changes | 1 - bsf.spec | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bsf.changes b/bsf.changes index e88168d..e5a49fd 100644 --- a/bsf.changes +++ b/bsf.changes @@ -2,7 +2,6 @@ Fri May 19 11:38:11 UTC 2017 - pcervinka@suse.com - New build dependency: javapackages-local -- Fixed PreReq to Requires(pre) - Spec file cleaned ------------------------------------------------------------------- diff --git a/bsf.spec b/bsf.spec index 8485515..da66241 100644 --- a/bsf.spec +++ b/bsf.spec @@ -1,7 +1,7 @@ # # spec file for package bsf # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -67,7 +67,6 @@ In addition, the following languages are supported with their own %package javadoc Summary: Javadoc for bsf Group: Development/Libraries/Java -Requires(pre): coreutils %description javadoc Bean Scripting Framework (BSF) is a set of Java classes which provides From a48161b769e63ded1e0ae2c06821f2df792aab8a1d82fc2b569d4f729a219acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 20 May 2017 18:40:17 +0000 Subject: [PATCH 6/6] - Remove jython from dependencies, not needed OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=27 --- bsf.changes | 5 +++++ bsf.spec | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bsf.changes b/bsf.changes index e5a49fd..79efe72 100644 --- a/bsf.changes +++ b/bsf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 20 18:41:16 UTC 2017 - tchvatal@suse.com + +- Remove jython from dependencies, not needed + ------------------------------------------------------------------- Fri May 19 11:38:11 UTC 2017 - pcervinka@suse.com diff --git a/bsf.spec b/bsf.spec index da66241..31fd6a1 100644 --- a/bsf.spec +++ b/bsf.spec @@ -34,9 +34,7 @@ BuildRequires: apache-commons-logging BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: javapackages-tools -BuildRequires: jython BuildRequires: rhino -#!BuildIgnore: mysql-connector-java BuildRequires: xalan-j2 BuildRequires: xml-commons-apis BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,7 +92,7 @@ rm -fr bsf %build [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java -export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2 jython servlet jspapi) +export CLASSPATH=$(build-classpath apache-commons-logging rhino xalan-j2 servlet jspapi) ant jar rm -rf bsf/src/org/apache/bsf/engines/java ant javadocs