From 86b203c398ec14dcc280b47b27ff06e7307c6c5b Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Jun 18 2018 11:16:33 +0000 Subject: Upload glide files --- diff --git a/.gitignore b/.gitignore index e5c251d..57a10aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/cli-8102d0e.tar.gz +/cli-8102d0ed5ea2709ade1243798785888175f6e415.tar.gz diff --git a/Fix-formatting-errors.patch b/Fix-formatting-errors.patch new file mode 100644 index 0000000..e9a116c --- /dev/null +++ b/Fix-formatting-errors.patch @@ -0,0 +1,42 @@ +From 7d938caf715c7ea5937b43fce73813e63bf1765b Mon Sep 17 00:00:00 2001 +From: Jan Chaloupka +Date: Mon, 18 Jun 2018 13:08:41 +0200 +Subject: [PATCH] Fix formatting errors + +--- + ui_colored_test.go | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ui_colored_test.go b/ui_colored_test.go +index 35bbbf5..bc7f637 100644 +--- a/ui_colored_test.go ++++ b/ui_colored_test.go +@@ -43,7 +43,7 @@ func TestColoredUi_Info(t *testing.T) { + ui.Info("foo") + + if mock.OutputWriter.String() != "\033[0;33mfoo\033[0m\n" { +- t.Fatalf("bad: %#v %#v", mock.OutputWriter.String()) ++ t.Fatalf("bad: %#v", mock.OutputWriter.String()) + } + } + +@@ -56,7 +56,7 @@ func TestColoredUi_Output(t *testing.T) { + ui.Output("foo") + + if mock.OutputWriter.String() != "\033[0;33mfoo\033[0m\n" { +- t.Fatalf("bad: %#v %#v", mock.OutputWriter.String()) ++ t.Fatalf("bad: %#v", mock.OutputWriter.String()) + } + } + +@@ -69,6 +69,6 @@ func TestColoredUi_Warn(t *testing.T) { + ui.Warn("foo") + + if mock.ErrorWriter.String() != "\033[0;33mfoo\033[0m\n" { +- t.Fatalf("bad: %#v %#v", mock.ErrorWriter.String()) ++ t.Fatalf("bad: %#v", mock.ErrorWriter.String()) + } + } +-- +2.7.5 + diff --git a/glide.lock b/glide.lock new file mode 100644 index 0000000..de58808 --- /dev/null +++ b/glide.lock @@ -0,0 +1,12 @@ +hash: dd3ca600845d2aac23c2f8e1735c0b47fa9a7ed244adcf724162af63ddfdc14b +imports: +- name: golang.org/x/sys + subpackages: + - unix + version: b9cf5f96b68d9eaa53d5db5fef235718767f416a +- name: golang.org/x/crypto + subpackages: + - ssh/terminal + version: 12892e8c234f4fe6f6803f052061de9057903bb2 +updated: '2018-06-18T11:10:06.272927+00:00' + diff --git a/glide.yaml b/glide.yaml new file mode 100644 index 0000000..ba3d18a --- /dev/null +++ b/glide.yaml @@ -0,0 +1,11 @@ +import: +- package: golang.org/x/sys + subpackages: + - unix + version: b9cf5f96b68d9eaa53d5db5fef235718767f416a +- package: golang.org/x/crypto + subpackages: + - ssh/terminal + version: 12892e8c234f4fe6f6803f052061de9057903bb2 +package: github.com/mitchellh/cli + diff --git a/golang-github-mitchellh-cli.spec b/golang-github-mitchellh-cli.spec index d2de272..111e31d 100644 --- a/golang-github-mitchellh-cli.spec +++ b/golang-github-mitchellh-cli.spec @@ -1,187 +1,62 @@ -# If any of the following macros should be set otherwise, -# you can wrap any of them with the following conditions: -# - %%if 0%%{centos} == 7 -# - %%if 0%%{?rhel} == 7 -# - %%if 0%%{?fedora} == 23 -# Or just test for particular distribution: -# - %%if 0%%{centos} -# - %%if 0%%{?rhel} -# - %%if 0%%{?fedora} -# -# Be aware, on centos, both %%rhel and %%centos are set. If you want to test -# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. -# (Don't forget to replace double percentage symbol with single one in order to apply a condition) - -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 0 -# Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - - -%global provider github -%global provider_tld com -%global project mitchellh -%global repo cli -# https://github.com/mitchellh/cli -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} +# http://github.com/mitchellh/cli + +%global goipath github.com/mitchellh/cli %global commit 8102d0ed5ea2709ade1243798785888175f6e415 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -Name: golang-%{provider}-%{project}-%{repo} + +%gometa -i + +Name: %{goname} Version: 0 -Release: 0.4.git%{shortcommit}%{?dist} +Release: 0.5%{?dist} Summary: Go library for implementing command-line interfaces # Detected licences # - *No copyright* MPL (v2.0) at 'LICENSE' License: MPLv2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} - - +URL: %{gourl} +Source0: %{gosource} +Source1: glide.yaml +Source2: glide.yaml +Patch0: Fix-formatting-errors.patch %description %{summary} -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(golang.org/x/crypto/ssh/terminal) -%endif - -Requires: golang(golang.org/x/crypto/ssh/terminal) - -Provides: golang(%{import_path}) = %{version}-%{release} %description devel %{summary} This package contains library source intended for building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif - - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +%{goipath} prefix. %prep -%setup -q -n %{repo}-%{commit} +%gosetup -q +cp %{SOURCE1} %{SOURCE2} . +%patch0 -p1 -%build %install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%goinstall glide.lock glide.yaml %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# No dependency directories so far - -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path} -%endif +%gochecks #define license tag if not already defined %{!?_licensedir:%global license %doc} - -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE %doc README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md -%endif %changelog +* Mon Jun 18 2018 Jan Chaloupka - 0-0.5.git8102d0e +- Upload glide files + * Wed Feb 07 2018 Fedora Release Engineering - 0-0.4.git8102d0e - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 8b60924..16e6bc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cli-8102d0e.tar.gz) = 61a7dc49629d834d9804d482eb2066ba705ca8ef764677eaef1fd34773c46a2a60fb33896b67320ced1120e9e8e36d4acb723693e2b7987675e17a4c57f9c391 +SHA512 (cli-8102d0ed5ea2709ade1243798785888175f6e415.tar.gz) = 61a7dc49629d834d9804d482eb2066ba705ca8ef764677eaef1fd34773c46a2a60fb33896b67320ced1120e9e8e36d4acb723693e2b7987675e17a4c57f9c391