diff --git a/.gitignore b/.gitignore index 92d6cd4..bdae015 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /goamz-caaaea8.tar.gz +/goamz-caaaea8b30ee15616494ee68abd5d8ebbbef05cf.tar.gz diff --git a/0001-Fix-Fatalf-arguments.patch b/0001-Fix-Fatalf-arguments.patch new file mode 100644 index 0000000..299fb6c --- /dev/null +++ b/0001-Fix-Fatalf-arguments.patch @@ -0,0 +1,12 @@ +diff -up goamz-caaaea8b30ee15616494ee68abd5d8ebbbef05cf/s3/s3i_test.go.fix_Fatalf goamz-caaaea8b30ee15616494ee68abd5d8ebbbef05cf/s3/s3i_test.go +--- goamz-caaaea8b30ee15616494ee68abd5d8ebbbef05cf/s3/s3i_test.go.fix_Fatalf 2015-03-17 18:43:35.000000000 +0100 ++++ goamz-caaaea8b30ee15616494ee68abd5d8ebbbef05cf/s3/s3i_test.go 2019-05-23 20:39:59.767128026 +0200 +@@ -507,7 +507,7 @@ func (s *ClientTests) TestMultiComplete( + c.Assert(len(data), Equals, len(data1)+len(data2)) + for i := range data1 { + if data[i] != data1[i] { +- c.Fatalf("uploaded object at byte %d: want %d, got %d", data1[i], data[i]) ++ c.Fatalf("uploaded object at byte: want %d, got %d", data1[i], data[i]) + } + } + c.Assert(string(data[len(data1):]), Equals, string(data2)) diff --git a/0001-motain-gocheck-to-check.v1.patch b/0001-motain-gocheck-to-check.v1.patch deleted file mode 100644 index d3205bb..0000000 --- a/0001-motain-gocheck-to-check.v1.patch +++ /dev/null @@ -1,333 +0,0 @@ -From 1f60481b7b15da6fdf2fc3845f126b5fc60db251 Mon Sep 17 00:00:00 2001 -From: Jan Chaloupka -Date: Fri, 10 Oct 2014 21:14:33 +0200 -Subject: [PATCH] motain/gocheck to check.v1 - ---- - autoscaling/autoscaling_test.go | 2 +- - aws/attempt_test.go | 2 +- - aws/aws_test.go | 2 +- - ec2/ec2_test.go | 2 +- - ec2/ec2i_test.go | 2 +- - ec2/ec2t_test.go | 2 +- - ec2/sign_test.go | 2 +- - elb/elb_test.go | 2 +- - exp/mturk/mturk_test.go | 2 +- - exp/mturk/sign_test.go | 2 +- - exp/sdb/sdb_test.go | 2 +- - exp/sdb/sign_test.go | 2 +- - exp/sns/sns_test.go | 2 +- - iam/iam_test.go | 2 +- - iam/iami_test.go | 2 +- - iam/iamt_test.go | 2 +- - rds/rds_test.go | 2 +- - s3/multi_test.go | 2 +- - s3/s3_test.go | 2 +- - s3/s3i_test.go | 2 +- - s3/s3t_test.go | 2 +- - s3/sign_test.go | 2 +- - testutil/suite.go | 2 +- - 23 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/autoscaling/autoscaling_test.go b/autoscaling/autoscaling_test.go -index 8cccdc2..7f094ef 100644 ---- a/autoscaling/autoscaling_test.go -+++ b/autoscaling/autoscaling_test.go -@@ -6,7 +6,7 @@ import ( - "github.com/mitchellh/goamz/autoscaling" - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - ) - - func Test(t *testing.T) { -diff --git a/aws/attempt_test.go b/aws/attempt_test.go -index 1fda5bf..2c5f4db 100644 ---- a/aws/attempt_test.go -+++ b/aws/attempt_test.go -@@ -2,7 +2,7 @@ package aws_test - - import ( - "github.com/mitchellh/goamz/aws" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "time" - ) - -diff --git a/aws/aws_test.go b/aws/aws_test.go -index 78cbbaf..1ff6ebe 100644 ---- a/aws/aws_test.go -+++ b/aws/aws_test.go -@@ -2,7 +2,7 @@ package aws_test - - import ( - "github.com/mitchellh/goamz/aws" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "io/ioutil" - "os" - "strings" -diff --git a/ec2/ec2_test.go b/ec2/ec2_test.go -index 93f2eaf..f4a115f 100644 ---- a/ec2/ec2_test.go -+++ b/ec2/ec2_test.go -@@ -6,7 +6,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/ec2" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - ) - - func Test(t *testing.T) { -diff --git a/ec2/ec2i_test.go b/ec2/ec2i_test.go -index 3773041..7b56446 100644 ---- a/ec2/ec2i_test.go -+++ b/ec2/ec2i_test.go -@@ -6,7 +6,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/ec2" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - ) - - // AmazonServer represents an Amazon EC2 server. -diff --git a/ec2/ec2t_test.go b/ec2/ec2t_test.go -index fe50356..447bdbc 100644 ---- a/ec2/ec2t_test.go -+++ b/ec2/ec2t_test.go -@@ -6,7 +6,7 @@ import ( - "github.com/mitchellh/goamz/ec2" - "github.com/mitchellh/goamz/ec2/ec2test" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "regexp" - "sort" - ) -diff --git a/ec2/sign_test.go b/ec2/sign_test.go -index 86d203e..3bd9a34 100644 ---- a/ec2/sign_test.go -+++ b/ec2/sign_test.go -@@ -3,7 +3,7 @@ package ec2_test - import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/ec2" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - ) - - // EC2 ReST authentication docs: http://goo.gl/fQmAN -diff --git a/elb/elb_test.go b/elb/elb_test.go -index d0a5caa..22c1be0 100644 ---- a/elb/elb_test.go -+++ b/elb/elb_test.go -@@ -4,7 +4,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/elb" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "testing" - ) - -diff --git a/exp/mturk/mturk_test.go b/exp/mturk/mturk_test.go -index ab21e9c..df181ae 100644 ---- a/exp/mturk/mturk_test.go -+++ b/exp/mturk/mturk_test.go -@@ -4,7 +4,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/exp/mturk" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "net/url" - "testing" - ) -diff --git a/exp/mturk/sign_test.go b/exp/mturk/sign_test.go -index b024fc3..884f797 100644 ---- a/exp/mturk/sign_test.go -+++ b/exp/mturk/sign_test.go -@@ -3,7 +3,7 @@ package mturk_test - import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/exp/mturk" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - ) - - // Mechanical Turk REST authentication docs: http://goo.gl/wrzfn -diff --git a/exp/sdb/sdb_test.go b/exp/sdb/sdb_test.go -index d194853..345d8ee 100644 ---- a/exp/sdb/sdb_test.go -+++ b/exp/sdb/sdb_test.go -@@ -4,7 +4,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/exp/sdb" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "testing" - ) - -diff --git a/exp/sdb/sign_test.go b/exp/sdb/sign_test.go -index 6ebd1c4..ee6afe0 100644 ---- a/exp/sdb/sign_test.go -+++ b/exp/sdb/sign_test.go -@@ -3,7 +3,7 @@ package sdb_test - import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/exp/sdb" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - ) - - // SimpleDB ReST authentication docs: http://goo.gl/CaY81 -diff --git a/exp/sns/sns_test.go b/exp/sns/sns_test.go -index 3eb97f4..221164c 100644 ---- a/exp/sns/sns_test.go -+++ b/exp/sns/sns_test.go -@@ -4,7 +4,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/exp/sns" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "testing" - ) - -diff --git a/iam/iam_test.go b/iam/iam_test.go -index 719a018..3ee976e 100644 ---- a/iam/iam_test.go -+++ b/iam/iam_test.go -@@ -4,7 +4,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/iam" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "strings" - "testing" - ) -diff --git a/iam/iami_test.go b/iam/iami_test.go -index 61e5be0..71dd7a9 100644 ---- a/iam/iami_test.go -+++ b/iam/iami_test.go -@@ -4,7 +4,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/iam" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "net/url" - ) - -diff --git a/iam/iamt_test.go b/iam/iamt_test.go -index 2e3449b..5c21d6d 100644 ---- a/iam/iamt_test.go -+++ b/iam/iamt_test.go -@@ -4,7 +4,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/iam" - "github.com/mitchellh/goamz/iam/iamtest" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - ) - - // LocalServer represents a local ec2test fake server. -diff --git a/rds/rds_test.go b/rds/rds_test.go -index 0ccadb7..983f079 100644 ---- a/rds/rds_test.go -+++ b/rds/rds_test.go -@@ -4,7 +4,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/rds" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "testing" - ) - -diff --git a/s3/multi_test.go b/s3/multi_test.go -index fbb03e0..26903cd 100644 ---- a/s3/multi_test.go -+++ b/s3/multi_test.go -@@ -3,7 +3,7 @@ package s3_test - import ( - "encoding/xml" - "github.com/mitchellh/goamz/s3" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "io" - "io/ioutil" - "strings" -diff --git a/s3/s3_test.go b/s3/s3_test.go -index 376c947..75f4f28 100644 ---- a/s3/s3_test.go -+++ b/s3/s3_test.go -@@ -11,7 +11,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/s3" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - ) - - func Test(t *testing.T) { -diff --git a/s3/s3i_test.go b/s3/s3i_test.go -index 24f9ad4..d2ed6d1 100644 ---- a/s3/s3i_test.go -+++ b/s3/s3i_test.go -@@ -11,7 +11,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/s3" - "github.com/mitchellh/goamz/testutil" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - "net" - "sort" - "time" -diff --git a/s3/s3t_test.go b/s3/s3t_test.go -index d3d4996..ed8b9df 100644 ---- a/s3/s3t_test.go -+++ b/s3/s3t_test.go -@@ -4,7 +4,7 @@ import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/s3" - "github.com/mitchellh/goamz/s3/s3test" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - ) - - type LocalServer struct { -diff --git a/s3/sign_test.go b/s3/sign_test.go -index 9d9fe8d..3a1b877 100644 ---- a/s3/sign_test.go -+++ b/s3/sign_test.go -@@ -3,7 +3,7 @@ package s3_test - import ( - "github.com/mitchellh/goamz/aws" - "github.com/mitchellh/goamz/s3" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - ) - - // S3 ReST authentication docs: http://goo.gl/G1LrK -diff --git a/testutil/suite.go b/testutil/suite.go -index 2d432a0..561036c 100644 ---- a/testutil/suite.go -+++ b/testutil/suite.go -@@ -3,7 +3,7 @@ package testutil - import ( - "flag" - "github.com/mitchellh/goamz/aws" -- . "github.com/motain/gocheck" -+ . "gopkg.in/check.v1" - ) - - // Amazon must be used by all tested packages to determine whether to --- -1.9.3 - diff --git a/golang-github-mitchellh-goamz.spec b/golang-github-mitchellh-goamz.spec index b157636..a176c8e 100644 --- a/golang-github-mitchellh-goamz.spec +++ b/golang-github-mitchellh-goamz.spec @@ -1,186 +1,56 @@ -%if 0%{?fedora} || 0%{?rhel} == 6 -%global with_devel 1 -%global with_bundled 0 -%global with_debug 0 -# ec2,elb failing locally -# rds,iam,route53,s3,autoscaling,aws,exp/mturk,exp/sdb,exp/sns locally ok -%global with_check 0 -%global with_unit_test 1 -%else -%global with_devel 0 -%global with_bundled 0 -%global with_debug 0 -%global with_check 0 -%global with_unit_test 0 -%endif - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif +# Generated by go2rpm +%bcond_without check -%global provider github -%global provider_tld com -%global project mitchellh -%global repo goamz # https://github.com/mitchellh/goamz -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} +%global goipath github.com/mitchellh/goamz %global commit caaaea8b30ee15616494ee68abd5d8ebbbef05cf -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} -Version: 0 -Release: 0.17.git%{shortcommit}%{?dist} -Summary: An Amazon Library for Go -License: LGPLv3+ -URL: http://%{import_path} -Source0: https://github.com/%{project}/%{repo}/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 %{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} -%description -%{summary} +%gometa -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch +%global common_description %{expand: +An Amazon Library for Go.} -%if 0%{?with_check} -BuildRequires: golang(github.com/motain/gocheck) -BuildRequires: golang(github.com/vaughan0/go-ini) -%endif +%global golicenses LICENSE +%global godocs CHANGES.md README.md -Requires: golang(github.com/motain/gocheck) -Requires: golang(github.com/vaughan0/go-ini) - -Provides: golang(%{import_path}/autoscaling) = %{version}-%{release} -Provides: golang(%{import_path}/aws) = %{version}-%{release} -Provides: golang(%{import_path}/ec2) = %{version}-%{release} -Provides: golang(%{import_path}/ec2/ec2test) = %{version}-%{release} -Provides: golang(%{import_path}/elb) = %{version}-%{release} -Provides: golang(%{import_path}/exp/mturk) = %{version}-%{release} -Provides: golang(%{import_path}/exp/sdb) = %{version}-%{release} -Provides: golang(%{import_path}/exp/sns) = %{version}-%{release} -Provides: golang(%{import_path}/iam) = %{version}-%{release} -Provides: golang(%{import_path}/iam/iamtest) = %{version}-%{release} -Provides: golang(%{import_path}/rds) = %{version}-%{release} -Provides: golang(%{import_path}/route53) = %{version}-%{release} -Provides: golang(%{import_path}/s3) = %{version}-%{release} -Provides: golang(%{import_path}/s3/s3test) = %{version}-%{release} -Provides: golang(%{import_path}/testutil) = %{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 -Summary: Unit tests for %{name} package -# 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} +Name: %{goname} +Version: 0 +Release: 0.18%{?dist} +Summary: Golang Amazon Library -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif +License: LGPLv3.0-only +URL: %{gourl} +Source0: %{gosource} +# Fix Fatalf arguments +Patch0: 0001-Fix-Fatalf-arguments.patch -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} +BuildRequires: golang(gopkg.in/check.v1) +BuildRequires: golang(github.com/vaughan0/go-ini) -%description unit-test -%{summary} +%description +%{common_description} -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +%gopkg %prep -%setup -q -n %{repo}-%{commit} - -%build +%goprep +%patch0 -p1 +find . -name "*.go" -exec sed -i "s|github.com/motain/gocheck|gopkg.in/check.v1|" "{}" +; %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") ; do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list -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.file-list -for file in $(find . -iname "*_test.go"); do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list -done -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%gopkginstall +%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 +%gocheck -d s3 %endif -%gotest %{import_path}/autoscaling -%gotest %{import_path}/aws -%gotest %{import_path}/ec2 -%gotest %{import_path}/elb -%gotest %{import_path}/exp/mturk -%gotest %{import_path}/exp/sdb -%gotest %{import_path}/exp/sns -%gotest %{import_path}/iam -%gotest %{import_path}/rds -%gotest %{import_path}/route53 -%gotest %{import_path}/s3 -%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 CHANGES.md README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test -f unit-test.file-list -%license LICENSE -%doc CHANGES.md README.md -%endif +%gopkgfiles %changelog +* Thu May 23 19:58:46 CEST 2019 Robert-André Mauchin - 0-0.18.20150520gitcaaaea8 +- Update to new macros + * Fri Feb 01 2019 Fedora Release Engineering - 0-0.17.gitcaaaea8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 3e599da..a2a7208 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9420fc3d831f27bc762314a5055eb90a goamz-caaaea8.tar.gz +SHA512 (goamz-caaaea8b30ee15616494ee68abd5d8ebbbef05cf.tar.gz) = 70bd2c6213600090d00cac86e219798270fab87fb8199c78c4db732c4d05f531cd95cccf574d36c1a09986062fce79e3bbec5a46e47294a28b13dfe19b57f635