diff --git a/.gitignore b/.gitignore index 66d440b..d104b0d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /expect-5c2eadb35b136ae1529cef7fc966188c6267323e.tar.gz /expect-1.0.1.tar.gz +/expect-778a5f0c600305097a09c66558691650b2f5b4b5.tar.gz diff --git a/0001-Disable-flag.Parse-in-init.patch b/0001-Disable-flag.Parse-in-init.patch deleted file mode 100644 index ea8a817..0000000 --- a/0001-Disable-flag.Parse-in-init.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a153267f5a18ac51d184b5ebc26b0395c3f7165e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Mon, 5 Aug 2019 21:37:45 +0200 -Subject: [PATCH] Disable flag.Parse() in init -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -See https://github.com/golang/go/issues/31859 for rationale - -Signed-off-by: Robert-André Mauchin ---- - runner.go | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/runner.go b/runner.go -index 742c9b6..fd80ee4 100644 ---- a/runner.go -+++ b/runner.go -@@ -25,7 +25,6 @@ var ( - ) - - func init() { -- flag.Parse() - pattern = regexp.MustCompile("(?i)" + *matchFlag) - if *showStdout == true { - silentOut = stdout --- -2.21.0 - diff --git a/golang-github-karlseguin-expect.spec b/golang-github-karlseguin-expect.spec index d404a0b..9f5212b 100644 --- a/golang-github-karlseguin-expect.spec +++ b/golang-github-karlseguin-expect.spec @@ -4,6 +4,7 @@ # https://github.com/karlseguin/expect %global goipath github.com/karlseguin/expect Version: 1.0.1 +%global commit 778a5f0c600305097a09c66558691650b2f5b4b5 %gometa @@ -18,7 +19,7 @@ A library to help you write tests in Go.} %global gosupfiles glide.lock glide.yaml Name: %{goname} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Testing framework for Go License: MIT @@ -26,9 +27,6 @@ URL: %{gourl} Source0: %{gosource} Source1: glide.yaml Source2: glide.lock -# Disable flag.Parse() in init -# See https://github.com/golang/go/issues/31859 for rationale -Patch0: 0001-Disable-flag.Parse-in-init.patch BuildRequires: golang(github.com/wsxiaoys/terminal/color) @@ -39,7 +37,6 @@ BuildRequires: golang(github.com/wsxiaoys/terminal/color) %prep %goprep -%patch0 -p1 find . -name "*.go" -exec sed -i "s|gopkg.in/karlseguin/expect.v1|github.com/karlseguin/expect|" "{}" +; cp %{S:1} %{S:2} . @@ -63,6 +60,9 @@ end %gopkgfiles %changelog +* Fri Aug 09 19:22:29 CEST 2019 Robert-André Mauchin - 1.0.1-5.20190809git778a5f0 +- Bump to commit 778a5f0c600305097a09c66558691650b2f5b4b5 + * Mon Aug 05 22:21:54 CEST 2019 Robert-André Mauchin - 1.0.1-4 - Add patch to disable flag.Parse() in init diff --git a/sources b/sources index a66bb7e..617b565 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (expect-1.0.1.tar.gz) = adaa7c09cc5711dfc54bcded4742bdb6c6945a2c3153bdb9659e71ecb739310b0870df588d3ebb0dd9cba6d812b37974d6a596720ac5e9f473a7e45fb456e4d5 +SHA512 (expect-778a5f0c600305097a09c66558691650b2f5b4b5.tar.gz) = 9fa4b0276b68274c2bcde026e66a03e3bc2dc036c25ca234b2060dd787095bdda6a21767887113d836055ec9aecb1cf774b1e2102b30551f9ad9577a6056ecb9