diff --git a/.gitignore b/.gitignore index 87f08d0..fb08e68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /cli-61f519f.tar.gz /cli-1.20.0.tar.gz +/cli-693af58b4d51b8fcc7f9d89576da170765980581.tar.gz diff --git a/0001-fix-ineffective-assigns.patch b/0001-fix-ineffective-assigns.patch deleted file mode 100644 index feb322e..0000000 --- a/0001-fix-ineffective-assigns.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 55428b5..992a692 100644 --- a/golang-github-urfave-cli.spec +++ b/golang-github-urfave-cli.spec @@ -1,88 +1,57 @@ -# Run tests in check section +# Generated by go2rpm %bcond_without check # https://github.com/urfave/cli %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 commit 693af58b4d51b8fcc7f9d89576da170765980581 + +%gometa + +%global goaltipaths gopkg.in/urfave/cli.v1 github.com/codegangsta/cli %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 +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 +%global golicenses LICENSE +%global godocs CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md MAINTAINERS.md README.md Name: %{goname} -Release: 2%{?dist} -Summary: A simple, fast, and fun package for building command line apps in Go -# Detected licences -# - Expat License at 'LICENSE' +Release: 3%{?dist} +Summary: Simple, fast, and fun package for building command line apps in go + License: MIT URL: %{gourl} Source0: %{gosource} -Patch0: 0001-fix-ineffective-assigns.patch - -BuildRequires: golang(github.com/BurntSushi/toml) -BuildRequires: golang(gopkg.in/yaml.v2) +BuildRequires: golang(github.com/BurntSushi/toml) +BuildRequires: golang(gopkg.in/urfave/cli.v1) +BuildRequires: golang(gopkg.in/yaml.v2) %description %{common_description} - -%package devel -Summary: %{summary} -BuildArch: noarch - -%description devel -%{common_description} - -This package contains library source intended for -building other packages which use import path with -%{goipath} prefix. - - -%package -n %{goname_v1}-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{goname_v1}-devel -%{common_description} - -This package contains compatibility glue for code that imports the -%{goipath_v1} Go namespace. - +%gopkg %prep -%forgeautosetup -p1 - +%goprep %install -%goinstall - -install -m 0755 -vd %{buildroot}%{gopath}/src/%(dirname %{goipath_v1}) -ln -s %{gopath}/src/%{goipath} %{buildroot}%{gopath}/src/%{goipath_v1} - +%gopkginstall %if %{with check} %check -%gochecks -d altsrc +%gocheck %endif - -%files devel -f devel.file-list -%license LICENSE -%doc README.md CHANGELOG.md - - -%files -n %{goname_v1}-devel -%dir %{gopath}/src/%(dirname %{goipath_v1}) -%{gopath}/src/%{goipath_v1} - +%gopkgfiles %changelog +* Tue Apr 23 23:15:50 CEST 2019 Robert-André Mauchin - 1.20.0-3.20190623git693af58 +- Bump to commit 693af58b4d51b8fcc7f9d89576da170765980581 + * Fri Feb 01 2019 Fedora Release Engineering - 1.20.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -110,10 +79,10 @@ ln -s %{gopath}/src/%{goipath} %{buildroot}%{gopath}/src/%{goipath_v1} * Wed Jul 27 2016 jchaloup - 1.17.0-0.2.git6011f16 - enable devel and unit-test for epel7 - related: #1354378 + related: #1354378 * Mon Jul 11 2016 jchaloup - 0-0.1.git6011f16 - First package for Fedora - resolves: #1354378 + resolves: #1354378 diff --git a/sources b/sources index 20e90a0..4548d91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cli-1.20.0.tar.gz) = 0a47a47121e25bceb6ebdf10a55ab3bc7531214284b1669fe20237c3ac938c7cd154ebc408759202d936688350e27e47d14f6a6b0793271c10534f2e90bd1fb5 +SHA512 (cli-693af58b4d51b8fcc7f9d89576da170765980581.tar.gz) = 90e674819a8e74243739ae2c8ee0d7ff06726c8465365de5a1dfe2c9dda500b4f76456ad7c469777fec97d535669aa905ed80b98e608cea47d7c028504f023da