From 3910cc5ecc8c210745b8dd06b4bc2b64ff5bf32f Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jun 27 2019 19:27:59 +0000
Subject: Update to final tagged release


---

diff --git a/0003-Port-to-bouncycastle-1.61-API.patch b/0003-Port-to-bouncycastle-1.61-API.patch
deleted file mode 100644
index 4dbdd15..0000000
--- a/0003-Port-to-bouncycastle-1.61-API.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1efe1200c6694836fce298665dda538abab1f226 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-Date: Tue, 12 Mar 2019 18:44:51 +0000
-Subject: [PATCH 3/3] Port to bouncycastle 1.61 API
-
----
- .../eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java   | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java
-index df9615f..3099d8c 100644
---- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java
-+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/internal/BouncyCastleGpgKeyLocator.java
-@@ -67,6 +67,7 @@
- import org.bouncycastle.gpg.keybox.KeyInformation;
- import org.bouncycastle.gpg.keybox.PublicKeyRingBlob;
- import org.bouncycastle.gpg.keybox.UserID;
-+import org.bouncycastle.gpg.keybox.bc.BcBlobVerifier;
- import org.bouncycastle.openpgp.PGPException;
- import org.bouncycastle.openpgp.PGPPublicKey;
- import org.bouncycastle.openpgp.PGPSecretKey;
-@@ -383,7 +384,7 @@ private KeyBox readKeyBoxFile(Path keyboxFile) throws IOException {
- 			// note: KeyBox constructor reads in the whole InputStream at once
- 			// this code will change in 1.61 to
- 			// either 'new BcKeyBox(in)' or 'new JcaKeyBoxBuilder().build(in)'
--			keyBox = new KeyBox(in, new JcaKeyFingerprintCalculator());
-+			keyBox = new KeyBox(in, new JcaKeyFingerprintCalculator(), new BcBlobVerifier());
- 		}
- 		return keyBox;
- 	}
--- 
-2.20.1
-
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index b58bb08..aa40ae5 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -1,16 +1,16 @@
-%global gittag 5.4.0.201905221418-m3
+%global gittag 5.4.0.201906121030-r
 
 # Due to circular self-dependency, one build must be done with this flag set
 # when updating to new versions. A second build without this flag ensures that
 # all symlinks are generated correctly.
-%bcond_with bootstrap
+%bcond_without bootstrap
 
 # Set this to build standalone jgit command line tool only
 %bcond_without jgit_eclipse_features
 
 Name:           eclipse-jgit
 Version:        5.4.0
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 Summary:        Eclipse JGit
 
 License:        BSD
@@ -24,8 +24,6 @@ Patch0:         0001-Ensure-the-correct-classpath-is-set-for-the-jgit-com.patch
 #  org.slf4j.api -> slf4j.api
 #  org.slf4j.impl.log4j12 -> slf4j.simple
 Patch1:         0002-Don-t-embed-versions-of-third-party-libs-use-feature.patch
-# Changes necessary for the latest version of bouncycastle
-Patch2:         0003-Port-to-bouncycastle-1.61-API.patch
 
 BuildArch: noarch
 
@@ -99,7 +97,6 @@ Command line Git tool built entirely in Java.
 %setup -n jgit-%{gittag} -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # Disable multithreaded build
 rm .mvn/maven.config
@@ -208,6 +205,9 @@ EOF
 %endif
 
 %changelog
+* Thu Jun 27 2019 Mat Booth <mat.booth@redhat.com> - 5.4.0-1
+- Update to final tagged release
+
 * Fri May 31 2019 Mat Booth <mat.booth@redhat.com> - 5.4.0-0.1
 - Update to latest milestone release
 
diff --git a/sources b/sources
index 4e815c0..bafd65e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jgit-5.4.0.201905221418-m3.tar.xz) = c58f90abfd0a46c7c7036630db3c0624ae3190cef87910117179a89a2d3e1a8aa983e15c25fae75fddf6ad616ea9387676131890d90c05e026b454ecb47783f6
+SHA512 (jgit-5.4.0.201906121030-r.tar.xz) = c9a6fbac18e415fc3db7e16c21a2c7a305a872bde90f5f501480392efdf5ade64a41e3f0c67ffbdb95eba19b0af9ec8028096cba754f3c178791d063512fa331