This commit is contained in:
parent
11e21f9b14
commit
9ff6f93f4a
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 31 19:51:51 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- 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 <fstrba@suse.com>
|
Fri May 5 08:24:40 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -36,6 +36,7 @@ Patch1: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch
|
|||||||
Patch2: jgit-shade.patch
|
Patch2: jgit-shade.patch
|
||||||
Patch3: jgit-5.11.0-java8.patch
|
Patch3: jgit-5.11.0-java8.patch
|
||||||
Patch4: jgit-apache-sshd-2.7.0.patch
|
Patch4: jgit-apache-sshd-2.7.0.patch
|
||||||
|
Patch5: jgit-jsch.patch
|
||||||
# For main build
|
# For main build
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: apache-commons-compress
|
BuildRequires: apache-commons-compress
|
||||||
@ -95,6 +96,7 @@ A pure Java implementation of the Git version control system.
|
|||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
# Disable multithreaded build
|
# Disable multithreaded build
|
||||||
rm .mvn/maven.config
|
rm .mvn/maven.config
|
||||||
|
11
jgit-jsch.patch
Normal file
11
jgit-jsch.patch
Normal file
@ -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)",
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 31 19:51:51 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- 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 <fstrba@suse.com>
|
Mon Mar 27 08:18:14 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -36,6 +36,7 @@ Patch1: 0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch
|
|||||||
Patch2: jgit-shade.patch
|
Patch2: jgit-shade.patch
|
||||||
Patch3: jgit-5.11.0-java8.patch
|
Patch3: jgit-5.11.0-java8.patch
|
||||||
Patch4: jgit-apache-sshd-2.7.0.patch
|
Patch4: jgit-apache-sshd-2.7.0.patch
|
||||||
|
Patch5: jgit-jsch.patch
|
||||||
# For main build
|
# For main build
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -92,6 +93,7 @@ Group: Documentation/HTML
|
|||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
# Disable multithreaded build
|
# Disable multithreaded build
|
||||||
rm .mvn/maven.config
|
rm .mvn/maven.config
|
||||||
|
Loading…
Reference in New Issue
Block a user