Sync from SUSE:SLFO:Main jsch revision 757a870cc724802cfdc8ed1017ba550c

This commit is contained in:
Adrian Schröter 2024-05-31 14:45:33 +02:00
parent 4791584c5a
commit 2feb34a04e
2 changed files with 16 additions and 4 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Apr 29 12:18:36 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- The binaries are compatible with java 1.8
-------------------------------------------------------------------
Wed Feb 21 10:47:53 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 20 12:47:08 UTC 2023 - Gus Kenion <gkenion@suse.com> Wed Dec 20 12:47:08 UTC 2023 - Gus Kenion <gkenion@suse.com>

View File

@ -16,6 +16,9 @@
# #
# The automatic requires would be java-headless >= 9, but the
# binaries are java 8 compatible
%define __requires_exclude java-headless
Name: jsch Name: jsch
Version: 0.2.15 Version: 0.2.15
Release: 0 Release: 0
@ -36,8 +39,7 @@ BuildRequires: javapackages-local >= 6
BuildRequires: jna BuildRequires: jna
BuildRequires: jna-contrib BuildRequires: jna-contrib
BuildRequires: slf4j BuildRequires: slf4j
# The jar still works with Java 8 Requires: java-headless >= 1.8
Requires: java >= 1.8
BuildArch: noarch BuildArch: noarch
%description %description
@ -71,14 +73,14 @@ cp %{SOURCE1} build.xml
%pom_remove_dep com.kohlschutter.junixsocket: %pom_remove_dep com.kohlschutter.junixsocket:
rm -f \ rm -f \
src/main/java/com/jcraft/jsch/JUnixSocketFactory.java src/main/java/com/jcraft/jsch/JUnixSocketFactory.java
%patch0 -p1 %patch -P 0 -p1
# Do not depend on log4j # Do not depend on log4j
%pom_remove_dep org.apache.logging.log4j: %pom_remove_dep org.apache.logging.log4j:
rm -f \ rm -f \
src/main/java/com/jcraft/jsch/Log4j2Logger.java \ src/main/java/com/jcraft/jsch/Log4j2Logger.java \
src/test/java/com/jcraft/jsch/Log4j2LoggerTest.java src/test/java/com/jcraft/jsch/Log4j2LoggerTest.java
%patch1 -p1 %patch -P 1 -p1
%build %build
mkdir -p lib mkdir -p lib