The package rpms/golang-github-chzyer-test.git has added or updated architecture specific
content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-chzyer-test.git/com....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 8791dbe7edc142abc09375f3c958c361d5819a39
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 23:20:44 2018 +0100
Fix BuildRequires
diff --git a/golang-github-chzyer-test.spec b/golang-github-chzyer-test.spec
index 70f5336..351cac1 100644
--- a/golang-github-chzyer-test.spec
+++ b/golang-github-chzyer-test.spec
@@ -11,15 +11,13 @@ Golang test utility.}
Name: %{goname}
Version: 0
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
Summary: Golang test utility
License: MIT
URL: %{gourl}
Source: %{gosource}
-%if %{with check}
BuildRequires:
golang(github.com/chzyer/logex)
-%endif
%description
%{common_description}
@@ -56,6 +54,9 @@ the %{goipath} Go namespace.
%changelog
+* Wed Mar 14 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.5.20180314gita1ea475
+- Fix BuildRequires
+
* Thu Mar 08 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.4.20180314gita1ea475
- Update with the new Go packaging
commit 065dfb25c63685c09ce40977953058d3ae02f745
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Wed Mar 14 01:47:00 2018 +0100
Update with the new Go packaging
diff --git a/.gitignore b/.gitignore
index ae64840..d0f5dce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/test-bea8f08.tar.gz
+/test-a1ea475d72b168a29f44221e0ad031a842642302.tar.gz
diff --git a/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
b/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
deleted file mode 100644
index a98b8f7..0000000
--- a/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 14dddcea5c6ef2b327e25728130efa493404c086 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
-Date: Tue, 13 Feb 2018 00:58:34 +0100
-Subject: [PATCH] Fix erroneous number of arguments in Errorf
-
----
- test.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test.go b/test.go
-index a53b054..aef573a 100644
---- a/test.go
-+++ b/test.go
-@@ -107,10 +107,10 @@ func ReadAndCheck(r io.Reader, b []byte) {
- func Read(r io.Reader, b []byte) {
- n, err := r.Read(b)
- if err != nil && !logex.Equal(err, io.EOF) {
-- Panic(0, fmt.Errorf("Read: %v, got: %v", err))
-+ Panic(0, fmt.Errorf("Read error: %v", err))
- }
- if n != len(b) {
-- Panic(0, fmt.Errorf("Read: %v, got: %v", n))
-+ Panic(0, fmt.Errorf("Read: %v, want: %v", n, len(b)))
- }
- }
-
---
-2.14.3
-
diff --git a/golang-github-chzyer-test.spec b/golang-github-chzyer-test.spec
index 9525688..70f5336 100644
--- a/golang-github-chzyer-test.spec
+++ b/golang-github-chzyer-test.spec
@@ -1,190 +1,64 @@
-# 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 chzyer
-%global repo test
-#
https://github.com/chzyer/test
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit bea8f082b6fd8382588bf6fdc6af9217078af151
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20160617
+%bcond_without check
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.3.%{commitdate}git%{shortcommit}%{?dist}
-Summary: Golang test utility
-License: MIT
-URL: https://%{provider_prefix}
-Source0:
https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+%global goipath
github.com/chzyer/test
+%global commit a1ea475d72b168a29f44221e0ad031a842642302
-#
https://github.com/chzyer/test/issues/1
-Patch0: 0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
+%global common_description %{expand:
+Golang test utility.}
-# 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}
+%gometa
+Name: %{goname}
+Version: 0
+Release: 0.4%{?dist}
+Summary: Golang test utility
+License: MIT
+URL: %{gourl}
+Source: %{gosource}
-
-%description
-%{summary}
-
-%if 0%{?with_devel}
-%package devel
-Summary: %{summary}
-BuildArch: noarch
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
+%if %{with check}
BuildRequires:
golang(github.com/chzyer/logex)
%endif
-Requires:
golang(github.com/chzyer/logex)
+%description
+%{common_description}
-Provides: golang(%{import_path}) = %{version}-%{release}
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
%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}
+%{common_description}
+
+This package contains the source code needed for building packages that import
+the %{goipath} Go namespace.
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
%prep
-%setup -q -n %{repo}-%{commit}
-%patch0 -p1
+%gosetup -q
+
-%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
+%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") ; 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
+%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
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
+%gochecks
%endif
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-%gotest %{import_path}
-%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 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
+* Thu Mar 08 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.4.20180314gita1ea475
+- Update with the new Go packaging
+
* Tue Feb 13 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.3.20160617gitbea8f08
- Added patch fixing erroneous number of arguments in Errorf function
diff --git a/sources b/sources
index d3ea09d..c71a68f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (test-bea8f08.tar.gz) =
85542dbb3c24aea339e753565ddc793a80ad7cfe18d73e78b5a49ca00c46274e19a57ac44e1be6e126c92919e7cf660c05a948c368de1d12a1414ba37e4ff16c
+SHA512 (test-a1ea475d72b168a29f44221e0ad031a842642302.tar.gz) =
e4d7ee906d543e3ce790e0530c6efc3a89aa814ca33f65564f1d0da4b757fda9cd8fefc5a50fcb78cb977c718c3ea0153066ed5aa6b5d5402e067e01a4c70c93
commit b1d9d004e338fadf0d1783d54b9cd9b2eb19906c
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Tue Feb 13 01:13:23 2018 +0100
Added patch fixing erroneous number of arguments in Errorf function
diff --git a/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
b/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
new file mode 100644
index 0000000..a98b8f7
--- /dev/null
+++ b/0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
@@ -0,0 +1,29 @@
+From 14dddcea5c6ef2b327e25728130efa493404c086 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
+Date: Tue, 13 Feb 2018 00:58:34 +0100
+Subject: [PATCH] Fix erroneous number of arguments in Errorf
+
+---
+ test.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test.go b/test.go
+index a53b054..aef573a 100644
+--- a/test.go
++++ b/test.go
+@@ -107,10 +107,10 @@ func ReadAndCheck(r io.Reader, b []byte) {
+ func Read(r io.Reader, b []byte) {
+ n, err := r.Read(b)
+ if err != nil && !logex.Equal(err, io.EOF) {
+- Panic(0, fmt.Errorf("Read: %v, got: %v", err))
++ Panic(0, fmt.Errorf("Read error: %v", err))
+ }
+ if n != len(b) {
+- Panic(0, fmt.Errorf("Read: %v, got: %v", n))
++ Panic(0, fmt.Errorf("Read: %v, want: %v", n, len(b)))
+ }
+ }
+
+--
+2.14.3
+
diff --git a/golang-github-chzyer-test.spec b/golang-github-chzyer-test.spec
index c74fb55..9525688 100644
--- a/golang-github-chzyer-test.spec
+++ b/golang-github-chzyer-test.spec
@@ -43,12 +43,15 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
+Release: 0.3.%{commitdate}git%{shortcommit}%{?dist}
Summary: Golang test utility
License: MIT
URL: https://%{provider_prefix}
Source0:
https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+#
https://github.com/chzyer/test/issues/1
+Patch0: 0001-Fix-erroneous-number-of-arguments-in-Errorf.patch
+
# 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.
@@ -104,6 +107,7 @@ providing packages with %{import_path} prefix.
%prep
%setup -q -n %{repo}-%{commit}
+%patch0 -p1
%build
%install
@@ -181,6 +185,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Tue Feb 13 2018 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.3.20160617gitbea8f08
+- Added patch fixing erroneous number of arguments in Errorf function
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.2.20160617gitbea8f08
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit d940cef8cd3250c701282a7bd94955205d86cf44
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 14:03:25 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/golang-github-chzyer-test.spec b/golang-github-chzyer-test.spec
index ad6c3c3..c74fb55 100644
--- a/golang-github-chzyer-test.spec
+++ b/golang-github-chzyer-test.spec
@@ -43,7 +43,7 @@
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.1.%{commitdate}git%{shortcommit}%{?dist}
+Release: 0.2.%{commitdate}git%{shortcommit}%{?dist}
Summary: Golang test utility
License: MIT
URL: https://%{provider_prefix}
@@ -181,6 +181,9 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.2.20160617gitbea8f08
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Fri Sep 29 2017 Robert-André Mauchin <zebob.m(a)gmail.com> -
0-0.1.20160617gitbea8f08
- First package for Fedora