From fff10636a3d44726da3ca1f3f73d1a4c14119d68 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Dec 15 2017 10:06:56 +0000
Subject: Update to latest release

Bootstrap mode

---

diff --git a/.gitignore b/.gitignore
index fd1584e..ededfbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /jgit-*.tar.xz
+/jgit-*.tar.gz
 /jgit-*/
 /results_eclipse-jgit
 /noarch
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index 9c774e4..f0deb29 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -1,18 +1,19 @@
-%global version_suffix 201710071750-r
+%global gittag %{version}.201712030800-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
 
 Name:           eclipse-jgit
-Version:        4.9.0
-Release:        2%{?dist}
+Version:        4.9.1
+Release:        1%{?dist}
 Summary:        Eclipse JGit
 
 License:        BSD
 URL:            http://www.eclipse.org/egit/
-Source0:        http://git.eclipse.org/c/jgit/jgit.git/snapshot/jgit-v%{version}.%{version_suffix}.tar.xz
+# Use github mirror for now, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=522144
+Source0:        https://github.com/eclipse/jgit/archive/v%{gittag}/jgit-v%{gittag}.tar.gz
 Patch0:         fix_jgit_sh.patch
 # Change how feature deps are specified, to avoid embedding versions
 Patch1:         jgit-feature-deps.patch
@@ -70,7 +71,7 @@ Requires:       javaewah >= 1.1.6
 Command line Git tool built entirely in Java.
 
 %prep
-%setup -n jgit-v%{version}.%{version_suffix} -q
+%setup -n jgit-%{gittag} -q
 
 %patch0
 %patch1
@@ -184,6 +185,10 @@ EOF
 %license LICENSE
 
 %changelog
+* Fri Dec 15 2017 Mat Booth <mat.booth@redhat.com> - 4.9.1-1
+- Update to latest release
+- Bootstrap mode
+
 * Tue Nov 21 2017 Mat Booth <mat.booth@redhat.com> - 4.9.0-2
 - Rebuild to generate Eclipse features
 
diff --git a/jgit-feature-deps.patch b/jgit-feature-deps.patch
index 7a62ae2..cfaa6a8 100644
--- a/jgit-feature-deps.patch
+++ b/jgit-feature-deps.patch
@@ -149,8 +149,8 @@
 +++ ./org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml	2016-05-02 16:57:17.671700728 +0100
 @@ -33,6 +33,9 @@
     <requires>
-       <import feature="org.eclipse.jgit" version="4.9.0" match="equivalent"/>
-       <import feature="org.eclipse.jgit.lfs" version="4.9.0" match="equivalent"/>
+       <import feature="org.eclipse.jgit" version="4.9.1" match="equivalent"/>
+       <import feature="org.eclipse.jgit.lfs" version="4.9.1" match="equivalent"/>
 +      <import plugin="org.apache.commons.compress" />
 +      <import plugin="org.kohsuke.args4j" />
 +      <import plugin="javaewah" />
diff --git a/sources b/sources
index 336fa35..1d9ab9b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jgit-v4.9.0.201710071750-r.tar.xz) = b2273367351bf986c09f536d79ee3c457f75ffb6899827d7d1c9d42522af69fb36bedf659bc70fc5ce7f7d122b99b1347c3374ab3263695277c982d9f2fef76a
+SHA512 (jgit-v4.9.1.201712030800-r.tar.gz) = 8d58b59c316333d5c0382c9f53640392ef93131afcdfed1bedb3a1d43657cdcdc1941a570b37da0d2550bb127340b2adf91417689c963b66b67003f268c9ab4c