jchaloup pushed to golang-github-spf13-cobra (f20). "Bump to upstream 3c187e904540cd62f0a197cddd6da02645a7cc5a (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 23 13:47:05 UTC 2015
>From 849d9ae8292874e7605e1d68a77c6150ca70de2f Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Thu, 23 Apr 2015 15:38:55 +0200
Subject: Bump to upstream 3c187e904540cd62f0a197cddd6da02645a7cc5a - related:
#1214769
diff --git a/Remove-Windows-related-code.patch b/Remove-Windows-related-code.patch
new file mode 100644
index 0000000..3d84ec8
--- /dev/null
+++ b/Remove-Windows-related-code.patch
@@ -0,0 +1,45 @@
+From d90eb3addaa6a822f9789d5ed53b330582a21c7f Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup at redhat.com>
+Date: Thu, 23 Apr 2015 15:35:58 +0200
+Subject: [PATCH] Remove Windows related code
+
+---
+ command.go | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/command.go b/command.go
+index 59654c2..5ad5599 100644
+--- a/command.go
++++ b/command.go
+@@ -18,13 +18,10 @@ package cobra
+ import (
+ "bytes"
+ "fmt"
+- "github.com/inconshreveable/mousetrap"
+ flag "github.com/spf13/pflag"
+ "io"
+ "os"
+- "runtime"
+ "strings"
+- "time"
+ )
+
+ // Command is just that, a command for your application.
+@@ -472,14 +469,6 @@ func (c *Command) Execute() (err error) {
+ return c.Root().Execute()
+ }
+
+- if EnableWindowsMouseTrap && runtime.GOOS == "windows" {
+- if mousetrap.StartedByExplorer() {
+- c.Print(MousetrapHelpText)
+- time.Sleep(5 * time.Second)
+- os.Exit(1)
+- }
+- }
+-
+ // initialize help as the last point possible to allow for user
+ // overriding
+ c.initHelp()
+--
+1.9.3
+
diff --git a/golang-github-spf13-cobra.spec b/golang-github-spf13-cobra.spec
index 979317d..9743e21 100644
--- a/golang-github-spf13-cobra.spec
+++ b/golang-github-spf13-cobra.spec
@@ -4,16 +4,18 @@
%global project spf13
%global repo cobra
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit 79bd93d369fb73d640179208d4e2b1a748915567
+%global commit 3c187e904540cd62f0a197cddd6da02645a7cc5a
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.7.git%{shortcommit}%{?dist}
+Release: 0.8.git%{shortcommit}%{?dist}
Summary: A Commander for modern go CLI interactions
License: ASL 2.0
URL: http://%{import_path}
Source0: https://%{import_path}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+Patch0: Remove-Windows-related-code.patch
+
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
BuildArch: noarch
%else
@@ -55,6 +57,7 @@ which use spf13/cobra.
%prep
%setup -q -n %{repo}-%{commit}
+%patch0 -p1
%build
@@ -71,6 +74,10 @@ GOPATH=%{buildroot}/%{gopath}:%{gopath} go test %{import_path}
%{gopath}/src/%{import_path}
%changelog
+* Thu Apr 23 2015 jchaloup <jchaloup at redhat.com> - 0-0.8.git3c187e9
+- Bump to upstream 3c187e904540cd62f0a197cddd6da02645a7cc5a
+ related: #1214769
+
* Tue Mar 31 2015 jchaloup <jchaloup at redhat.com> - 0-0.7.git79bd93d
- Bump to upstream 79bd93d369fb73d640179208d4e2b1a748915567
related: #1085881
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/golang-github-spf13-cobra.git/commit/?h=f20&id=849d9ae8292874e7605e1d68a77c6150ca70de2f
More information about the scm-commits
mailing list