From cc2e36375852aa4f1a8a93a7f5a27005abf3afac565085c2da0bf60bf3c715fa Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Thu, 7 Sep 2017 17:22:36 +0000
Subject: [PATCH 1/2] First step to buildability with jdk9

OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=29
---
 bsf.changes            | 8 ++++++++
 bsf.spec               | 3 ++-
 build.properties.patch | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bsf.changes b/bsf.changes
index 79efe72..edd0709 100644
--- a/bsf.changes
+++ b/bsf.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep  7 17:18:12 UTC 2017 - fstrba@suse.com
+
+- Force java source and target levels to 1.6 in order to allow
+  building with jdk9
+- Force using of java-1_8_0-openjdk-devel, since javadoc errors are
+  fatal in jdk9
+
 -------------------------------------------------------------------
 Sat May 20 18:41:16 UTC 2017 - tchvatal@suse.com
 
diff --git a/bsf.spec b/bsf.spec
index 31fd6a1..c03247b 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -31,7 +31,8 @@ Patch0:         build-file.patch
 Patch1:         build.properties.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-logging
-BuildRequires:  java-devel
+# Disable this one whenever the javadoc build is fixed for jdk9
+BuildRequires:  java-1_8_0-openjdk-devel
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  rhino
diff --git a/build.properties.patch b/build.properties.patch
index abc1051..b410177 100644
--- a/build.properties.patch
+++ b/build.properties.patch
@@ -35,7 +35,7 @@ diff --new-file -r -u bsf-2.4.0-orig/build-properties.xml bsf-2.4.0/build-proper
 +    <property name="site.dest" location="docs"/>
 +    <property name="site.projectFile" value="stylesheets/project.xml"/>
 +
-+    <property name="source.level" value="1.3" />
++    <property name="source.level" value="1.6" />
 +
 +    <property name="src.dir" value="src"/>
 +

From 195ff5a7c9d826f16c4f75890400b72f0cf9d260f797b79783b0c33f0afa2686 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 11 Sep 2017 14:29:23 +0000
Subject: [PATCH 2/2] Fix build on systems where jdk9 is the default

OBS-URL: https://build.opensuse.org/package/show/Java:packages/bsf?expand=0&rev=30
---
 bsf.spec | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bsf.spec b/bsf.spec
index c03247b..a5ee153 100644
--- a/bsf.spec
+++ b/bsf.spec
@@ -31,15 +31,14 @@ Patch0:         build-file.patch
 Patch1:         build.properties.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-logging
-# Disable this one whenever the javadoc build is fixed for jdk9
-BuildRequires:  java-1_8_0-openjdk-devel
+BuildRequires:  java-devel >= 1.6
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  rhino
 BuildRequires:  xalan-j2
 BuildRequires:  xml-commons-apis
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+BuildConflicts: java-devel >= 1.9
 
 %description
 Bean Scripting Framework (BSF) is a set of Java classes that provides
@@ -113,14 +112,12 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
-%defattr(-,root,root)
 %doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
 %{_javadir}/*
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_datadir}/maven-metadata/%{name}.xml
 
 %files javadoc
-%defattr(-,root,root)
 %dir %{_javadocdir}/%{name}
 %{_javadocdir}/%{name}