From 9ff6f93f4abba25a778387adf542093c74e9543f98f1d85905f301190fec9cf7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 31 May 2023 19:54:12 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=43 --- eclipse-jgit.changes | 9 +++++++++ eclipse-jgit.spec | 2 ++ jgit-jsch.patch | 11 +++++++++++ jgit.changes | 9 +++++++++ jgit.spec | 2 ++ 5 files changed, 33 insertions(+) create mode 100644 jgit-jsch.patch diff --git a/eclipse-jgit.changes b/eclipse-jgit.changes index d87ef43..82567df 100644 --- a/eclipse-jgit.changes +++ b/eclipse-jgit.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed May 31 19:51:51 UTC 2023 - Fridrich Strba + +- Added patch: + * jgit-jsch.patch + + extend the version range for the required jsch package + + allows building with 0.2.x (which is backward compatible + with 0.1.x) + ------------------------------------------------------------------- Fri May 5 08:24:40 UTC 2023 - Fridrich Strba diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index c4aaa26..1f3c543 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -36,6 +36,7 @@ Patch1: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch Patch2: jgit-shade.patch Patch3: jgit-5.11.0-java8.patch Patch4: jgit-apache-sshd-2.7.0.patch +Patch5: jgit-jsch.patch # For main build BuildRequires: ant BuildRequires: apache-commons-compress @@ -95,6 +96,7 @@ A pure Java implementation of the Git version control system. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # Disable multithreaded build rm .mvn/maven.config diff --git a/jgit-jsch.patch b/jgit-jsch.patch new file mode 100644 index 0000000..1e42db7 --- /dev/null +++ b/jgit-jsch.patch @@ -0,0 +1,11 @@ +--- jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF 2021-03-09 22:10:22.000000000 +0100 ++++ jgit-5.11.0.202103091610-r/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF 2023-05-31 21:46:41.989226527 +0200 +@@ -15,7 +15,7 @@ + org.eclipse.jgit.internal.transport.ssh, + org.eclipse.jgit.util, + com.jcraft.jsch" +-Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", ++Import-Package: com.jcraft.jsch;version="[0.1.37,1.0.0)", + org.eclipse.jgit.errors;version="[5.11.0,5.12.0)", + org.eclipse.jgit.internal;version="[5.11.0,5.12.0)", + org.eclipse.jgit.internal.transport.ssh;version="[5.11.0,5.12.0)", diff --git a/jgit.changes b/jgit.changes index 59defda..8b34927 100644 --- a/jgit.changes +++ b/jgit.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed May 31 19:51:51 UTC 2023 - Fridrich Strba + +- Added patch: + * jgit-jsch.patch + + extend the version range for the required jsch package + + allows building with 0.2.x (which is backward compatible + with 0.1.x) + ------------------------------------------------------------------- Mon Mar 27 08:18:14 UTC 2023 - Fridrich Strba diff --git a/jgit.spec b/jgit.spec index adde7f3..ff0cb7f 100644 --- a/jgit.spec +++ b/jgit.spec @@ -36,6 +36,7 @@ Patch1: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch Patch2: jgit-shade.patch Patch3: jgit-5.11.0-java8.patch Patch4: jgit-apache-sshd-2.7.0.patch +Patch5: jgit-jsch.patch # For main build BuildRequires: ant BuildRequires: fdupes @@ -92,6 +93,7 @@ Group: Documentation/HTML %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # Disable multithreaded build rm .mvn/maven.config