The package rpms/golang-github-ncw-swift.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-ncw-swift.git/commi....
Change:
-%ifnarch aarch64 %{arm}
Thanks.
Full change:
============
commit d86a1cb6dcf7b9ee8c5230ed1215eb4efd753c42
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Jun 20 11:55:34 2018 +0200
Upload glide files
diff --git a/.gitignore b/.gitignore
index 74e70a6..15e8610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/swift-9d3f812.tar.gz
+/swift-9d3f812e23d270d1c66a9a01e20af1005061cdc4.tar.gz
diff --git a/Fix-formatting-errors.patch b/Fix-formatting-errors.patch
new file mode 100644
index 0000000..7c86835
--- /dev/null
+++ b/Fix-formatting-errors.patch
@@ -0,0 +1,37 @@
+From 856daee0cf21f7aba8105d58c4b75f0e9d843124 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup(a)redhat.com>
+Date: Wed, 20 Jun 2018 11:53:01 +0200
+Subject: [PATCH] Fix formatting errors
+
+---
+ watchdog_reader_test.go | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/watchdog_reader_test.go b/watchdog_reader_test.go
+index dadcdf1..8e8f013 100644
+--- a/watchdog_reader_test.go
++++ b/watchdog_reader_test.go
+@@ -106,7 +106,7 @@ func TestWatchdogReaderOnSlowNetwork(t *testing.T) {
+ b := make([]byte, len(byteString))
+ n, err := io.ReadFull(wr, b)
+ if err != nil || n != len(b) || !bytes.Equal(b, byteString) {
+- t.Fatal("Bad read %s %d", err, n)
++ t.Fatalf("Bad read %s %d", err, n)
+ }
+
+ checkTimer(t, firedChan, false)
+@@ -129,9 +129,9 @@ func TestWatchdogReaderValidity(t *testing.T) {
+ b := make([]byte, len(byteString))
+ n, err := io.ReadFull(wr, b)
+ if err != nil || n != len(b) {
+- t.Fatal("Read error: %s", err)
++ t.Fatalf("Read error: %s", err)
+ }
+ if !bytes.Equal(b, byteString) {
+- t.Fatal("Bad read: %#v != %#v", string(b), string(byteString))
++ t.Fatalf("Bad read: %#v != %#v", string(b), string(byteString))
+ }
+ }
+--
+2.7.5
+
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 0000000..db64522
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,4 @@
+hash: 2c7ae07e806e9225d61d44a8b7d1d8e49d63004ca5ad168d47d230e898e74440
+imports: []
+updated: '2018-06-20T09:55:20.306423+00:00'
+
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 0000000..9b38f23
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,3 @@
+import: []
+package:
github.com/ncw/swift
+
diff --git a/golang-github-ncw-swift.spec b/golang-github-ncw-swift.spec
index 5935dfd..c258183 100644
--- a/golang-github-ncw-swift.spec
+++ b/golang-github-ncw-swift.spec
@@ -1,162 +1,58 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%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
-
-%global provider github
-%global provider_tld com
-%global project ncw
-%global repo swift
-#
https://github.com/ncw/swift
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+#
http://github.com/ncw/swift
+
+%global goipath
github.com/ncw/swift
%global commit 9d3f812e23d270d1c66a9a01e20af1005061cdc4
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-Name: golang-%{provider}-%{project}-%{repo}
+
+%gometa -i
+
+Name: %{goname}
Version: 0
-Release: 0.10.git%{shortcommit}%{?dist}
+Release: 0.11%{?dist}
Summary: Go language interface to Swift
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 %{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}
-%endif
-
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/rs) = %{version}-%{release}
-Provides: golang(%{import_path}/swifttest) = %{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}
-
-%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}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{goipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup -q
+cp %{SOURCE1} %{SOURCE2} .
+%patch0 -p1
%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
+%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
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%ifnarch aarch64 %{arm}
-%gotest %{import_path}
-%endif
-# takes too long
-#%%gotest %%{import_path}/rs
-%endif
+%gochecks
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license COPYING
%doc 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 COPYING
-%doc README.md
-%endif
%changelog
+* Wed Jun 20 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.11.git9d3f812
+- Upload glide files
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.10.git9d3f812
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index 3eab5ac..14a0223 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (swift-9d3f812.tar.gz) =
e647093a987d70fd62ae1ed9ef49cb8db90b32eb16b61cf2a7a4dae6901fa81699e19e675690d281f5a73613794dd5067daa367e97695f16185045ea215d1c1c
+SHA512 (swift-9d3f812e23d270d1c66a9a01e20af1005061cdc4.tar.gz) =
e647093a987d70fd62ae1ed9ef49cb8db90b32eb16b61cf2a7a4dae6901fa81699e19e675690d281f5a73613794dd5067daa367e97695f16185045ea215d1c1c