From e58efcb9888fa3a0a1c47c08a02f0ef91f0d9b85 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Oct 31 2018 15:08:18 +0000 Subject: Release 1.20.0 --- diff --git a/.gitignore b/.gitignore index 2c6ea55..87f08d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cli-61f519f.tar.gz +/cli-1.20.0.tar.gz diff --git a/0001-fix-ineffective-assigns.patch b/0001-fix-ineffective-assigns.patch new file mode 100644 index 0000000..feb322e --- /dev/null +++ b/0001-fix-ineffective-assigns.patch @@ -0,0 +1,30 @@ +From c3cc74dac756e33c2919ab998481809e8720e068 Mon Sep 17 00:00:00 2001 +From: Sebastian Sprenger +Date: Fri, 6 Oct 2017 07:28:43 +0200 +Subject: [PATCH 24/42] fix ineffective assigns + +--- + app_test.go | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/app_test.go b/app_test.go +index e14ddaf6..54e0951d 100644 +--- a/app_test.go ++++ b/app_test.go +@@ -497,7 +497,6 @@ func TestApp_Float64Flag(t *testing.T) { + } + + func TestApp_ParseSliceFlags(t *testing.T) { +- var parsedOption, firstArg string + var parsedIntSlice []int + var parsedStringSlice []string + +@@ -511,8 +510,6 @@ func TestApp_ParseSliceFlags(t *testing.T) { + Action: func(c *Context) error { + parsedIntSlice = c.IntSlice("p") + parsedStringSlice = c.StringSlice("ip") +- parsedOption = c.String("option") +- firstArg = c.Args().First() + return nil + }, + } diff --git a/golang-github-urfave-cli.spec b/golang-github-urfave-cli.spec index 1277ac6..25c43ee 100644 --- a/golang-github-urfave-cli.spec +++ b/golang-github-urfave-cli.spec @@ -1,187 +1,91 @@ -# 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 +%bcond_without check -%global provider github -%global provider_tld com -%global project urfave -%global repo cli # https://github.com/urfave/cli -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 61f519fe5e57c2518c03627b194899a105838eba -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} -Version: 1.18.0 -Release: 0.6.git%{shortcommit}%{?dist} +%global goipath github.com/urfave/cli +Version: 1.20.0 +%global goipath_v1 gopkg.in/urfave/cli.v1 +%global goname_v1 %gorpmname %{goipath_v1} + +%global common_description %{expand: +cli is a simple, fast, and fun package for building command line apps in Go. +The goal is to enable developers to write fast and distributable command line +applications in an expressive way.} + +%gometa + +Name: %{goname} +Release: 1%{?dist} Summary: A simple, fast, and fun package for building command line apps in Go # Detected licences -# - MIT/X11 (BSD like) at 'LICENSE' +# - Expat License at 'LICENSE' License: MIT -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} +Patch0: 0001-fix-ineffective-assigns.patch +BuildRequires: golang(github.com/BurntSushi/toml) +BuildRequires: golang(gopkg.in/yaml.v2) %description -%{summary} +%{common_description} + -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang(gopkg.in/yaml.v2) -BuildRequires: golang(github.com/BurntSushi/toml) -%endif - -Requires: golang(gopkg.in/yaml.v2) -Requires: golang(github.com/BurntSushi/toml) - -Provides: golang(%{import_path}) = %{version}-%{release} -Provides: golang(%{import_path}/altsrc) = %{version}-%{release} - %description devel -%{summary} +%{common_description} 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 +%{goipath} prefix. -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} -%if 0%{?with_check} && ! 0%{?with_bundled} -%endif +%package -n %{goname_v1}-devel +Summary: %{summary} +BuildArch: noarch +%description -n %{goname_v1}-devel +%{common_description} -%description unit-test-devel -%{summary} +This package contains compatibility glue for code that imports the +%{goipath_v1} Go namespace. -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif %prep -%setup -q -n %{repo}-%{commit} +%forgeautosetup -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" \! -iname "*_test.go" | grep -v "Godeps/_workspace") ; 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 +%goinstall -# 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" | grep -v "Godeps/_workspace") ; 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 +install -m 0755 -vd %{buildroot}%{gopath}/src/%(dirname %{goipath_v1}) +ln -s %{gopath}/src/%{goipath} %{buildroot}%{gopath}/src/%{goipath_v1} -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%if %{with check} %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path} -#i%%gotest %{import_path}/altsrc +%gochecks -d altsrc %endif -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE -%doc CHANGELOG.md README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif +%doc README.md CHANGELOG.md + + +%files -n %{goname_v1}-devel +%dir %{gopath}/src/%(dirname %{goipath_v1}) +%{gopath}/src/%{goipath_v1} -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%endif %changelog +* Wed Oct 31 2018 Robert-André Mauchin - 1.20.0-1 +- Release 1.20.0 + * Fri Jul 13 2018 Fedora Release Engineering - 1.18.0-0.6.git61f519f - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild @@ -208,3 +112,5 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} * Mon Jul 11 2016 jchaloup - 0-0.1.git6011f16 - First package for Fedora resolves: #1354378 + + diff --git a/sources b/sources index 6538d13..20e90a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cli-61f519f.tar.gz) = 4c56671e59539fd3b8e9d1c107ee27d2bfce3dacb06c66ab486f822a383bc001be0f0840d7caab5f225203ceb40fe93c50e216c75879aefc7ef8b3f2234a6c76 +SHA512 (cli-1.20.0.tar.gz) = 0a47a47121e25bceb6ebdf10a55ab3bc7531214284b1669fe20237c3ac938c7cd154ebc408759202d936688350e27e47d14f6a6b0793271c10534f2e90bd1fb5