From 38c6f22417d2c97ba07fefa796351bf294e3ef322fc8dcabe84ece161988ede5 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 25 Sep 2023 16:48:43 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/jython?expand=0&rev=45

---
 jython-java8compat.patch | 55 ++++++++++++++++++++++++++++++++++++++++
 jython.spec              |  1 +
 2 files changed, 56 insertions(+)
 create mode 100644 jython-java8compat.patch

diff --git a/jython-java8compat.patch b/jython-java8compat.patch
new file mode 100644
index 0000000..f6585c1
--- /dev/null
+++ b/jython-java8compat.patch
@@ -0,0 +1,55 @@
+diff --git a/build.xml b/build.xml
+index 52dfe71..43d7649 100644
+--- a/build.xml
++++ b/build.xml
+@@ -91,8 +91,8 @@ informix.jar = ../support/jdbc-4.10.12.jar
+ 
+         <property file="${user.home}/ant.properties" />
+         <property file="${basedir}/ant.properties" />
+-        <property name="jython.java.version" value="1.8" />
+-        <property name="jdk.source.version" value="1.8" />
++        <property name="jython.java.version" value="8" />
++        <property name="jdk.source.version" value="8" />
+ 
+         <!-- Designate the official release encoded in parts. In normal times, this is the *next*
+              official release, e.g. 2.7.2b2 while working towards 2.7.2b2, and sys.version will be
+@@ -681,6 +681,7 @@ The text for an official release would continue like ...
+                 destdir="${compile.dir}"
+                 target="${jdk.target.version}"
+                 source="${jdk.source.version}"
++                release="${jdk.target.version}"
+                 debug="${debug}"
+                 deprecation="${deprecation}"
+                 nowarn="${nowarn}"
+@@ -743,6 +744,7 @@ The text for an official release would continue like ...
+         <javac destdir="${compile.dir}"
+                target="${jdk.target.version}"
+                source="${jdk.source.version}"
++               release="${jdk.target.version}"
+                debug="${debug}"
+                deprecation="${deprecation}"
+                nowarn="${nowarn}"
+@@ -763,6 +765,7 @@ The text for an official release would continue like ...
+                destdir="${compile.dir}"
+                target="${jdk.target.version}"
+                source="${jdk.source.version}"
++               release="${jdk.target.version}"
+                debug="${debug}"
+                deprecation="${deprecation}"
+                nowarn="${nowarn}"
+@@ -795,6 +798,7 @@ The text for an official release would continue like ...
+                destdir="${test.compile.dir}"
+                target="${jdk.target.version}"
+                source="${jdk.source.version}"
++               release="${jdk.target.version}"
+                debug="${debug}"
+                deprecation="${deprecation}"
+                nowarn="${nowarn}"
+@@ -1209,6 +1213,7 @@ The text for an official release would continue like ...
+                destdir="${compile.dir}"
+                target="${jdk.target.version}"
+                source="${jdk.source.version}"
++               release="${jdk.target.version}"
+                debug="${debug}"
+                deprecation="${deprecation}"
+                nowarn="${nowarn}"
diff --git a/jython.spec b/jython.spec
index 1cd7f99..1247cae 100644
--- a/jython.spec
+++ b/jython.spec
@@ -34,6 +34,7 @@ Patch2:         %{name}-cachedir.patch
 Patch3:         %{name}-fix-tty-detection.patch
 Patch4:         %{name}-reproducible-now.patch
 Patch5:         %{name}-reproducible-builds.patch
+Patch6:         %{name}-java8compat.patch
 BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  antlr3-java