diff --git a/.gitignore b/.gitignore index ad6c803..7a37497 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.src.rpm /hub-635646f7f39c7747f9cb06cf15c3c0c37520706b.tar.gz /hub-e807a3891b13a45d52447b63ca4e54c25a78dc13.tar.gz /hub-748c1359b33e3f6af843d7b9eaaf990e563a8449.tar.gz @@ -24,3 +25,4 @@ /hub-2.12.2.tar.gz /hub-2.12.7.tar.gz /hub-2.12.8.tar.gz +/hub-2.13.0.tar.gz diff --git a/0001-Use-system-cucumber.patch b/0001-Use-system-cucumber.patch index c866280..4e37d20 100644 --- a/0001-Use-system-cucumber.patch +++ b/0001-Use-system-cucumber.patch @@ -1,7 +1,7 @@ -From 2b7bc89e0c757900799efadbbeba5bb997d605cf Mon Sep 17 00:00:00 2001 +From 4f2dadd1a654033e2731a4954ab3da0efe09f369 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 23 Jan 2019 03:08:52 -0500 -Subject: [PATCH 1/5] Use system cucumber +Subject: [PATCH 1/2] Use system cucumber Signed-off-by: Stephen Gallagher --- @@ -9,12 +9,10 @@ Signed-off-by: Stephen Gallagher 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 126a286675acf9b50c5489e2cf4d422aea9fbb58..e41114544650f60658a6d5e0d8edd67e79928a73 100644 +index 23b6368c103ffac9ad438b053a67a81b7cb2ca19..f4efff65f25515d513c6f443583844fcaafb12c2 100644 --- a/Makefile +++ b/Makefile -@@ -57,11 +57,11 @@ ifdef CI - else - script/test +@@ -66,7 +66,7 @@ else endif bin/cucumber: @@ -23,8 +21,6 @@ index 126a286675acf9b50c5489e2cf4d422aea9fbb58..e41114544650f60658a6d5e0d8edd67e fmt: go fmt ./... - - man-pages: $(HELP_ALL:=.md) $(HELP_ALL) $(HELP_ALL:=.txt) -- -2.21.0 +2.23.0 diff --git a/0002-Use-blackfriday.v2.patch b/0002-Use-blackfriday.v2.patch index f86b12d..ab65415 100644 --- a/0002-Use-blackfriday.v2.patch +++ b/0002-Use-blackfriday.v2.patch @@ -1,4 +1,4 @@ -From eadc4cbf5dee8209c9371ad478243fbbc42304b1 Mon Sep 17 00:00:00 2001 +From 18dffc3b09cccdd18e90cd966397da681bb9a3e3 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 17 Jul 2019 15:59:02 -0400 Subject: [PATCH 2/2] Use blackfriday.v2 @@ -13,9 +13,7 @@ diff --git a/md2roff-bin/cmd.go b/md2roff-bin/cmd.go index cf77de1f692a2519dc24dc442f81562f4457afac..907dae0449901585c93dbce033580bb11d419203 100644 --- a/md2roff-bin/cmd.go +++ b/md2roff-bin/cmd.go -@@ -11,11 +11,11 @@ import ( - "strings" - "text/template" +@@ -13,7 +13,7 @@ import ( "github.com/github/hub/md2roff" "github.com/github/hub/utils" @@ -24,15 +22,11 @@ index cf77de1f692a2519dc24dc442f81562f4457afac..907dae0449901585c93dbce033580bb1 ) var ( - flagManual, - flagVersion, diff --git a/md2roff/renderer.go b/md2roff/renderer.go -index 7aa971ae3dfbb47c038146f845f20edaac3a1512..54576de1fda9a132ca97d8fce0b5e276c64566c4 100644 +index 9b0a75357e35966db62e9fa7317cee7b47c4738b..bbf66b27aea710d25c8d3009e5697ac86df94bc4 100644 --- a/md2roff/renderer.go +++ b/md2roff/renderer.go -@@ -6,11 +6,11 @@ import ( - "io" - "regexp" +@@ -8,7 +8,7 @@ import ( "strconv" "strings" @@ -41,8 +35,6 @@ index 7aa971ae3dfbb47c038146f845f20edaac3a1512..54576de1fda9a132ca97d8fce0b5e276 ) // https://github.com/russross/blackfriday/blob/v2/markdown.go - const ( - PARSER_EXTENSIONS = blackfriday.NoIntraEmphasis | -- -2.21.0 +2.23.0 diff --git a/hub.spec b/hub.spec index 51e01a1..cd0f1c6 100644 --- a/hub.spec +++ b/hub.spec @@ -3,7 +3,7 @@ # https://github.com/github/hub %global goipath github.com/github/hub -Version: 2.12.8 +Version: 2.13.0 %gometa @@ -40,6 +40,7 @@ BuildRequires: golang(github.com/mattn/go-colorable) BuildRequires: golang(github.com/mattn/go-isatty) BuildRequires: golang(github.com/mitchellh/go-homedir) BuildRequires: golang(golang.org/x/crypto/ssh/terminal) +BuildRequires: golang(golang.org/x/net/http/httpproxy) BuildRequires: golang(gopkg.in/russross/blackfriday.v2) BuildRequires: golang(gopkg.in/yaml.v2) BuildRequires: git-core @@ -117,6 +118,9 @@ cp -p etc/hub.fish_completion %{buildroot}%{_datadir}/fish/completions/hub.fish %{_datadir}/vim/vimfiles/syntax/pullrequest.vim %changelog +* Wed Nov 06 2019 Stephen Gallagher - 2.13.0-1 +- Update to 2.13.0 + * Thu Oct 03 2019 Stephen Gallagher - 2.12.8-1 - Update to 2.12.8 diff --git a/sources b/sources index f781f24..1cf40e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hub-2.12.8.tar.gz) = 406643994136bab8ef8e875e2a7d53fe1e2d0313465c1b36b0c12a0fb48a5c2e7de6be6ca999de3465ed2833d5d68f77c83876858778e6fe350bb7bf0d7a5e76 +SHA512 (hub-2.13.0.tar.gz) = 77cc86948a4725a56b09eacdecb3227b46022de93f6ca8eb298441e32bda83cd8e6bb7874e029caae06852c6edcedfaa19382599d6f6ad9760663ff2573d2342