From 6c988b15b602ccfaedc3f98512945d1082298211 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Jan 23 2019 08:25:19 +0000 Subject: Update to 2.7.1 https://github.com/github/hub/releases/tag/v2.7.1 https://github.com/github/hub/releases/tag/v2.7.0 Signed-off-by: Stephen Gallagher --- diff --git a/.gitignore b/.gitignore index 0c2fcfb..80aaed2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /hub-2.5.0.tar.gz /hub-2.5.1.tar.gz /hub-2.6.0.tar.gz +/hub-2.7.1.tar.gz diff --git a/0002-Use-system-ronn-and-cucumber.patch b/0002-Use-system-ronn-and-cucumber.patch new file mode 100644 index 0000000..19685d3 --- /dev/null +++ b/0002-Use-system-ronn-and-cucumber.patch @@ -0,0 +1,35 @@ +From 98359c48cfc06ce61bbd9b0b8d40a5f4d81d4f74 Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Wed, 23 Jan 2019 03:08:52 -0500 +Subject: [PATCH 2/4] Use system ronn and cucumber + +Signed-off-by: Stephen Gallagher +--- + Makefile | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index e23b6211bce5938a3486b73b8d1141ae37d33778..a6bba4f8e9ac78555b7b5259f6e78e26d32621f3 100644 +--- a/Makefile ++++ b/Makefile +@@ -45,12 +45,15 @@ ifdef CI + script/test --coverage $(MIN_COVERAGE) + else + script/test + endif + +-bin/ronn bin/cucumber: +- script/bootstrap ++bin/ronn: ++ ln -s /usr/bin/ronn bin/ronn ++ ++bin/cucumber: ++ ln -s /usr/bin/cucumber bin/cucumber + + fmt: + go fmt ./... + + man-pages: $(HELP_ALL:=.ronn) $(HELP_ALL) $(HELP_ALL:=.txt) +-- +2.20.1 + diff --git a/0002-Use-system-ronn.patch b/0002-Use-system-ronn.patch deleted file mode 100644 index ef60b8f..0000000 --- a/0002-Use-system-ronn.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2fcfc13bac6b12e1b47109364a50cb3f73db59a1 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Wed, 13 Jun 2018 11:02:34 -0400 -Subject: [PATCH 2/2] Use system ronn - -Signed-off-by: Stephen Gallagher ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 6d9b7be13d2e1bd3634ffbda5e8191d8568af049..29871320616a2e05214159710177f7cfb4ddb3b2 100644 ---- a/Makefile -+++ b/Makefile -@@ -56,12 +56,12 @@ fmt: - man-pages: $(HELP_ALL:=.ronn) $(HELP_ALL) $(HELP_ALL:=.txt) - - %.txt: %.ronn - groff -Wall -mtty-char -mandoc -Tutf8 -rLL=$(TEXT_WIDTH)n $< | col -b >$@ - --%.1: %.1.ronn bin/ronn -- bin/ronn --organization=GITHUB --manual="Hub Manual" share/man/man1/*.ronn -+%.1: %.1.ronn -+ ronn --organization=GITHUB --manual="Hub Manual" share/man/man1/*.ronn - - %.1.ronn: bin/hub - bin/hub help $(*F) --plain-text | script/format-ronn $(*F) $@ - - share/man/man1/hub.1.ronn: --- -2.17.1 - diff --git a/0003-Add-build_id.patch b/0003-Add-build_id.patch index b0874af..273e6b0 100644 --- a/0003-Add-build_id.patch +++ b/0003-Add-build_id.patch @@ -1,7 +1,7 @@ -From deb51e425ec0dbd15810d9211434ef7448747b16 Mon Sep 17 00:00:00 2001 +From a9a5eab256bcff327fe6cf56b408bd08065ffbd3 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 16 Jul 2018 11:41:25 -0400 -Subject: [PATCH 3/3] Add build_id +Subject: [PATCH 3/4] Add build_id Signed-off-by: Stephen Gallagher --- @@ -26,5 +26,5 @@ index 458bad0eddc84cfe0253d4bb95e10db415c5f1d8..864ba544f32129bb311ef9942b73cec7 case "$1" in -- -2.17.1 +2.20.1 diff --git a/0004-Don-t-compress-DWARF.patch b/0004-Don-t-compress-DWARF.patch index d3122ab..6ae3286 100644 --- a/0004-Don-t-compress-DWARF.patch +++ b/0004-Don-t-compress-DWARF.patch @@ -1,4 +1,4 @@ -From 4ff2ef3252bf0545a2e4ba2aba9699b700a62c16 Mon Sep 17 00:00:00 2001 +From 44d087808634d78115d4df8a92fb6598e8802fb4 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 17 Jul 2018 09:06:15 -0400 Subject: [PATCH 4/4] Don't compress DWARF @@ -26,5 +26,5 @@ index 864ba544f32129bb311ef9942b73cec7521de8ef..d1d1d6def814aa06519a65dd72209889 case "$1" in -- -2.17.1 +2.20.1 diff --git a/hub.spec b/hub.spec index 9eeff13..0166418 100644 --- a/hub.spec +++ b/hub.spec @@ -22,7 +22,7 @@ Summary: A command-line wrapper for git with github shortcuts Name: hub -Version: 2.6.0 +Version: 2.7.1 Release: 1%{?dist} Group: Development/Languages License: MIT @@ -43,6 +43,8 @@ BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: git-core BuildRequires: rubygem-ronn +BuildRequires: rubygem-cucumber +BuildRequires: vim-filesystem BuildRequires: golang(gopkg.in/yaml.v1) BuildRequires: golang(github.com/bmizerany/assert) @@ -51,6 +53,7 @@ BuildRequires: golang(github.com/kballard/go-shellquote) BuildRequires: golang(github.com/mitchellh/go-homedir) Requires: git-core +Requires: vim-filesystem Provides: bundled(golang(github.com/inconshreveable/go-update)) Provides: bundled(golang(github.com/mattn/go-colorable)) @@ -59,7 +62,7 @@ Provides: bundled(golang(github.com/octokit/go-octokit)) Provides: bundled(golang(github.com/ogier/pflag)) # Fedora: use system ronn -Patch0002: 0002-Use-system-ronn.patch +Patch0002: 0002-Use-system-ronn-and-cucumber.patch # Fedora: add build-id for debugsource Patch0003: 0003-Add-build_id.patch @@ -124,7 +127,6 @@ cp -p etc/hub.bash_completion.sh %{buildroot}%{_sysconfdir}/bash_completion.d/. install -d -m 755 %{buildroot}%{_datarootdir}/zsh/site-functions/ cp -p etc/hub.zsh_completion %{buildroot}%{_datarootdir}/zsh/site-functions/_hub - %check %if 0%{run_tests} @@ -139,6 +141,7 @@ find . -maxdepth 2 -name '*.go' '!' -name '*_test.go' | \ xargs go test -v %endif + %files %license LICENSE %doc README.md CONTRIBUTING.md @@ -146,8 +149,16 @@ find . -maxdepth 2 -name '*.go' '!' -name '*_test.go' | \ %{_mandir}/man1/* %{_sysconfdir}/bash_completion.d/ %{_datarootdir}/zsh/site-functions/_hub +%{_datarootdir}/vim/vimfiles/ftdetect/pullrequest.vim +%{_datarootdir}/vim/vimfiles/syntax/pullrequest.vim + %changelog +* Wed Jan 23 2019 Stephen Gallagher - 2.7.1-1 +- Update to 2.7.1 +- https://github.com/github/hub/releases/tag/v2.7.1 +- https://github.com/github/hub/releases/tag/v2.7.0 + * Thu Nov 01 2018 Stephen Gallagher - 2.6.0-1 - Update to 2.6.0 - https://github.com/github/hub/releases/tag/v2.6.0 diff --git a/sources b/sources index 82a75d9..3f463da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hub-2.6.0.tar.gz) = 07a9f6d4362818adf68b4d0f43ed0f4b9bddfe347a6b7e10146b84b04e2699864361e629b19560f97c3ea4cf8ec020dc9ec52f9f156f3969b18e9085054f281f +SHA512 (hub-2.7.1.tar.gz) = 71232e443821dadc961d16f428cac01c0cc2adcd476e94727a5de430716826478803b8e6a881e2387103330122dd603180b546c99823c3c36942674185141714