From 21339aee50aace7a0abc1fa37730b65e8a9056699d51d66f254555df0ced5172 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 2 Jun 2023 10:16:48 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/jsch?expand=0&rev=40

---
 jsch-build.xml | 38 ++++++++++++++++++++++++++++++++++++++
 jsch.spec      |  6 +++---
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/jsch-build.xml b/jsch-build.xml
index 33aa4f7..20fa46a 100644
--- a/jsch-build.xml
+++ b/jsch-build.xml
@@ -164,6 +164,44 @@
         <pathelement location="${build.outputDir}"/>
       </classpath>
     </javac>
+    <!-- Override classes for Java 15+ -->
+    <mkdir dir="${build.mrOutputDir.15}"/>
+    <javac destdir="${build.mrOutputDir.15}"
+           nowarn="true"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           source="${compiler.source}"
+           target="${compiler.target}"
+           verbose="false"
+           fork="false">
+      <src>
+        <pathelement location="${build.mrSrcDir.15}"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${build.outputDir}"/>
+      </classpath>
+    </javac>
+    <!-- Override classes for Java 16+ -->
+    <mkdir dir="${build.mrOutputDir.16}"/>
+    <javac destdir="${build.mrOutputDir.16}"
+           nowarn="true"
+           debug="true"
+           optimize="false"
+           deprecation="true"
+           source="${compiler.source}"
+           target="${compiler.target}"
+           verbose="false"
+           fork="false">
+      <src>
+        <pathelement location="${build.mrSrcDir.16}"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${build.outputDir}"/>
+      </classpath>
+    </javac>
   </target>
 
   <!-- ====================================================================== -->
diff --git a/jsch.spec b/jsch.spec
index a637950..09edb79 100644
--- a/jsch.spec
+++ b/jsch.spec
@@ -22,15 +22,15 @@ Release:        0
 Summary:        Pure Java implementation of SSH2
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
-URL:            https://www.jcraft.com/jsch/
+URL:            https://github.com/mwiede/jsch/
 Source0:        https://github.com/mwiede/%{name}/archive/refs/tags/%{name}-%{version}.tar.gz
 Source1:        %{name}-build.xml
 Patch0:         jsch-junixsocket.patch
 Patch1:         jsch-log4j.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-# We build different multiversion overrides for 9, 10, 11
-BuildRequires:  java-devel >= 11
+# We build different multiversion overrides for 9, 10, 11, 15 and 16 and module-info.class
+BuildRequires:  java-devel >= 9
 BuildRequires:  bouncycastle
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  jna