From 9aed46ef708c03f0370a8a3ec8b560ef14998926 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Jun 14 2018 17:51:15 +0000
Subject: Updating to upstream commit a9a497c53cbbcead28b45114de5ca07c0acec66c


Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index 43f5c57..bb47697 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /hub-2.4.0.tar.gz
 /hub-prerelease-bec1441.tar.gz
 /hub-prerelease-e8a7d79.tar.gz
+/hub-prerelease-a9a497c.tar.gz
diff --git a/hub.spec b/hub.spec
index cd5cba3..669c4bf 100644
--- a/hub.spec
+++ b/hub.spec
@@ -11,7 +11,7 @@
 # https://fedoraproject.org/wiki/Packaging:SourceURL#Github
 # For a number of reasons (immutability, availability, uniqueness), you must
 # use the full commit revision hash when referring to the sources.
-%global commit e8a7d7968161f70f3cbd9b7c07a021ca01b54c3f
+%global commit a9a497c53cbbcead28b45114de5ca07c0acec66c
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 # Tests cannot run in mock buildroot currently
@@ -24,7 +24,7 @@
 Summary:        A command-line wrapper for git with github shortcuts
 Name:           hub
 Version:        prerelease
-Release:        5%{?dist}
+Release:        6%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://hub.github.com/
@@ -59,9 +59,6 @@ Provides: bundled(golang(github.com/mattn/go-isatty))
 Provides: bundled(golang(github.com/octokit/go-octokit))
 Provides: bundled(golang(github.com/ogier/pflag))
 
-# Submitted upstream as https://github.com/github/hub/pull/1777
-Patch0001: 0001-Add-DESTDIR-support-for-make-install.patch
-
 # Fedora: use system ronn
 Patch0002: 0002-Use-system-ronn.patch
 
@@ -82,6 +79,9 @@ features and commands that make working with GitHub easier.
 %autosetup -n %{name}-%{commit} -p1
 %endif
 
+mkdir -p src/github.com/github/
+ln -s `pwd` src/github.com/github/hub
+
 rm -rf vendor/gopkg.in/yaml.v1 \
        vendor/github.com/bmizerany/assert \
        vendor/github.com/BurntSushi/toml \
@@ -100,11 +100,10 @@ ln -s /usr/share/gocode/src/github.com/mitchellh/go-homedir \
       vendor/github.com/mitchellh/go-homedir
 
 %build
-%make_build
+GOPATH=`pwd` %make_build
 
 %install
-
-%make_install PREFIX=%{_prefix}
+GOPATH=`pwd` %make_install PREFIX=%{_prefix}
 
 # Bash-completion
 install -d -m 755 %{buildroot}%{_sysconfdir}/bash_completion.d/
@@ -138,6 +137,9 @@ find . -maxdepth 2 -name '*.go' '!' -name '*_test.go' | \
 %{_datarootdir}/zsh/site-functions/_hub
 
 %changelog
+* Thu Jun 14 2018 Stephen Gallagher <sgallagh@redhat.com> - prerelease-6
+- Updating to upstream commit a9a497c53cbbcead28b45114de5ca07c0acec66c
+
 * Thu Jun 14 2018 Stephen Gallagher <sgallagh@redhat.com> - prerelease-5
 - Don't own manpage directory
 
diff --git a/sources b/sources
index 5ad67db..10a5267 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hub-prerelease-e8a7d79.tar.gz) = d754c9981aca433e185dc73af1d104cfe25e323e933e174ac62907f7336f279394933c66fcf75bfaa99d27692dceae8a553c342c6ff9cae59fc4e47f85db97b4
+SHA512 (hub-prerelease-a9a497c.tar.gz) = 11bcc093d51895633220ea8c83a2b6e1078c6ff3e7f5e801ca870598e316a2eaeaa5bb0efdbae6732c734e50f0902bbde28ba92fc5ea77bb34a35787f4747208