diff --git a/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch b/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch index f17052f..ba62c0f 100644 --- a/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch +++ b/0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch @@ -1,7 +1,7 @@ -From 49b9177852da113b9fe2833a6f7b2acf1ba6491d Mon Sep 17 00:00:00 2001 +From 086cbe0274c5febce80bb350927c208c081aea44 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 7 Dec 2018 10:04:44 +0000 -Subject: [PATCH 1/3] Ensure the correct classpath is set for the jgit command +Subject: [PATCH 1/2] Ensure the correct classpath is set for the jgit command line tool --- @@ -9,7 +9,7 @@ Subject: [PATCH 1/3] Ensure the correct classpath is set for the jgit command 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.pgm/jgit.sh b/org.eclipse.jgit.pgm/jgit.sh -index e263782..87e85c7 100644 +index e263782..4086e37 100644 --- a/org.eclipse.jgit.pgm/jgit.sh +++ b/org.eclipse.jgit.pgm/jgit.sh @@ -60,7 +60,7 @@ esac @@ -22,5 +22,5 @@ index e263782..87e85c7 100644 if [ -n "$JGIT_CLASSPATH" ] then -- -2.20.1 +2.26.0.rc2 diff --git a/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch b/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch index 8f422b9..a58deb7 100644 --- a/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch +++ b/0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch @@ -1,20 +1,20 @@ -From 85226840dbe9f5547dd2778734415d6283c90258 Mon Sep 17 00:00:00 2001 +From 6a592d98519fd05f056abd47e51392f13ba1769e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 7 Dec 2018 10:17:02 +0000 -Subject: [PATCH 2/3] Don't embed versions of third-party libs, use feature +Subject: [PATCH 2/2] Don't embed versions of third-party libs, use feature requirements instead --- .../org.eclipse.jgit.feature/feature.xml | 83 +++---------------- - .../feature.xml | 16 +--- + .../feature.xml | 24 +----- .../feature.xml | 24 +----- .../org.eclipse.jgit.lfs.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 24 +----- .../feature.xml | 24 +----- - 6 files changed, 24 insertions(+), 155 deletions(-) + 6 files changed, 25 insertions(+), 162 deletions(-) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml -index d213b7b..1783bb1 100644 +index fcf4579..93c54dd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -22,6 +22,18 @@ @@ -113,19 +113,20 @@ index d213b7b..1783bb1 100644 - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml -index f45fb19..1f70cc1 100644 +index 27d9a77..dbb19a5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml -@@ -24,6 +24,8 @@ +@@ -24,6 +24,9 @@ - + + + ++ @@ -143,15 +144,22 @@ index f45fb19..1f70cc1 100644 - version="0.0.0" - unpack="false"/> - +- +- diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml -index 34a0868..d6b8125 100644 +index 8cfcd83..2de05ac 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -25,6 +25,9 @@ - + + + + @@ -185,13 +193,13 @@ index 34a0868..d6b8125 100644 - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml -index 8213753..3c5598b 100644 +index f8d32fe..de8116a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -24,6 +24,7 @@ - + + @@ -209,13 +217,13 @@ index 8213753..3c5598b 100644 - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml -index f6c9cfc..82caaa8 100644 +index 2d15f24..3457ba8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -38,6 +38,9 @@ - - - + + + + + + @@ -249,13 +257,13 @@ index f6c9cfc..82caaa8 100644 - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml -index f4dded6..9d92cb2 100644 +index 86e67dd..f81603b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -24,6 +24,9 @@ - + + + + @@ -289,5 +297,5 @@ index f4dded6..9d92cb2 100644 - -- -2.20.1 +2.26.0.rc2 diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index 587fb16..467428d 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -1,8 +1,8 @@ -%global gittag 5.6.0.201912101111-r +%global gittag 5.7.0.202003110725-r Name: eclipse-jgit -Version: 5.6.0 -Release: 2%{?dist} +Version: 5.7.0 +Release: 1%{?dist} Summary: Eclipse JGit # The jgit Eclipse plug-ins are "EDL" licensed, which is equivilent to the new BSD license @@ -75,6 +75,9 @@ popd %doc README.md %changelog +* Sun Mar 22 2020 Mat Booth - 5.7.0-1 +- Update to latest upstream release + * Tue Jan 28 2020 Fedora Release Engineering - 5.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index fe84eab..4eca808 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jgit-5.6.0.201912101111-r.tar.xz) = 5eb9c03062136618827ab1b7dd51ad8d4fb51ec1672ef236d55d3539cbf15b6df0c24568c2193a5a81dd3439017b723f455d162619ec22b78f8c64a0ea617b89 +SHA512 (jgit-5.7.0.202003110725-r.tar.xz) = 3266cdcef05a0408991537099829b6c7e2c45c93475f6c35449bc27f2cc62f38ae065dde95c9eea1e74d201f6e6ecc77aebb9436a11ddc629750f75c253efa92