The package rpms/golang-github-vmware-govcloudair.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-vmware-govcloudair.....
Change:
-%ifarch 0%{?gccgo_arches}
Thanks.
Full change:
============
commit 5ef88fdca6c0ff2831548834781805df230b9cbd
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Sat Apr 6 15:23:16 2019 +0200
Bump to commit daf883c2f1db1a1b08e3dc15b2a9f98c877a8d46 (#1695291)
Update to new Go packaging
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 0937d42..9567c6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/govcloudair-0d7be90.tar.gz
+/govcloudair-daf883c2f1db1a1b08e3dc15b2a9f98c877a8d46.tar.gz
diff --git a/0001-Fix-formatting-of-Fatalf-messages.patch
b/0001-Fix-formatting-of-Fatalf-messages.patch
new file mode 100644
index 0000000..908c82e
--- /dev/null
+++ b/0001-Fix-formatting-of-Fatalf-messages.patch
@@ -0,0 +1,83 @@
+From 422544ef0febc5e7860d30f81a52031ac6d8cbf1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
+Date: Sat, 6 Apr 2019 15:09:07 +0200
+Subject: [PATCH] Fix formatting of Fatalf messages
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
+---
+ api_vca_test.go | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/api_vca_test.go b/api_vca_test.go
+index f9ee85b..d4e0c8c 100644
+--- a/api_vca_test.go
++++ b/api_vca_test.go
+@@ -149,7 +149,7 @@ func TestClient_vaacquireservice(t *testing.T) {
+ }
+
+ if vacomputehref.String() !=
"http://localhost:4444/api/vchs/compute/00000000-0000-0000-0000-000000000000" {
+- t.Fatalf("VAComputeHREF not set on client: %s", vacomputehref)
++ t.Fatalf("VAComputeHREF not set on client: %s", vacomputehref.String())
+ }
+
+ if client.Region != "US - Anywhere" {
+@@ -212,7 +212,7 @@ func TestClient_vaacquirecompute(t *testing.T) {
+ }
+
+ if vavdchref.String() !=
"http://localhost:4444/api/vchs/compute/00000000-0000-0000-0000-000000000000/vdc/00000000-0000-0000-0000-000000000000/vcloudsession"
{
+- t.Fatalf("VAVDCHREF not set on client: %s", vavdchref)
++ t.Fatalf("VAVDCHREF not set on client: %s", vavdchref.String())
+ }
+
+ // Test client errors
+@@ -276,7 +276,7 @@ func TestClient_vagetbackendauth(t *testing.T) {
+ t.Fatalf("VCDAuthHeader not set on client: %s",
client.Client.VCDAuthHeader)
+ }
+ if client.Client.VCDVDCHREF.String() !=
"http://localhost:4444/api/vdc/00000000-0000-0000-0000-000000000000" {
+- t.Fatalf("VDC not set on client: %s", client.Client.VCDVDCHREF)
++ t.Fatalf("VDC not set on client: %s", client.Client.VCDVDCHREF.String())
+ }
+
+ // Test client errors
+@@ -368,7 +368,7 @@ func TestClient_vaacquireservice_env(t *testing.T) {
+ }
+
+ if vacomputehref.String() !=
"http://localhost:4444/api/vchs/compute/00000000-0000-0000-0000-000000000000" {
+- t.Fatalf("VAComputeHREF not set on client: %s", vacomputehref)
++ t.Fatalf("VAComputeHREF not set on client: %s", vacomputehref.String())
+ }
+
+ if client.Region != "US - Anywhere" {
+@@ -399,7 +399,7 @@ func TestClient_vaacquirecompute_env(t *testing.T) {
+ }
+
+ if vavdchref.String() !=
"http://localhost:4444/api/vchs/compute/00000000-0000-0000-0000-000000000000/vdc/00000000-0000-0000-0000-000000000000/vcloudsession"
{
+- t.Fatalf("VAVDCHREF not set on client: %s", vavdchref)
++ t.Fatalf("VAVDCHREF not set on client: %s", vavdchref.String())
+ }
+
+ }
+@@ -432,7 +432,7 @@ func TestClient_vagetbackendauth_env(t *testing.T) {
+ t.Fatalf("VCDAuthHeader not set on client: %s",
client.Client.VCDAuthHeader)
+ }
+ if client.Client.VCDVDCHREF.String() !=
"http://localhost:4444/api/vdc/00000000-0000-0000-0000-000000000000" {
+- t.Fatalf("VDC not set on client: %s", client.Client.VCDVDCHREF)
++ t.Fatalf("VDC not set on client: %s", client.Client.VCDVDCHREF.String())
+ }
+
+ }
+@@ -611,7 +611,7 @@ func makeClient(t *testing.T) VAClient {
+ t.Fatalf("VCDAuthHeader not set on client: %s",
client.Client.VCDAuthHeader)
+ }
+ if client.Client.VCDVDCHREF.String() !=
"http://localhost:4444/api/vdc/00000000-0000-0000-0000-000000000000" {
+- t.Fatalf("VDC not set on client: %s", client.Client.VCDVDCHREF)
++ t.Fatalf("VDC not set on client: %s", client.Client.VCDVDCHREF.String())
+ }
+
+ return *client
+--
+2.21.0
+
diff --git a/golang-github-vmware-govcloudair.spec
b/golang-github-vmware-govcloudair.spec
index 57de963..29a52bd 100644
--- a/golang-github-vmware-govcloudair.spec
+++ b/golang-github-vmware-govcloudair.spec
@@ -1,180 +1,76 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-# 4444: bind: address already in use
-%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
+# Generated by go2rpm
+%bcond_without check
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
+#
https://github.com/vmware/govcloudair
+%global goipath
github.com/vmware/govcloudair
+Version: 0.0.2
+%global commit daf883c2f1db1a1b08e3dc15b2a9f98c877a8d46
-%define copying() \
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 \
-%license %{*} \
-%else \
-%doc %{*} \
-%endif
+%gometa
+
+%global common_description %{expand:
+This package provides the govcloudair package which offers an interface to the
+vCloud Air 5.6 and 5.7 API and vCloud Director 5.5 API.
+
+It serves as a foundation for a project currently in development, there are
+plans to make it a general purpose API in the future. The govcloudair package is
+used by the Terraform provider for vCloud Director.
+
+The API is currently under heavy development, its coverage is extremely limited
+at the moment.
+
+The bindings now support both Subscription and On-demand accounts and vCloud
+Director 5.5.}
+
+Name: %{goname}
+Release: 1%{?dist}
+Summary: Vcloud air api bindings for golang
-%global provider github
-%global provider_tld com
-%global project vmware
-%global repo govcloudair
-#
https://github.com/vmware/govcloudair
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global commit 0d7be903f950c035d6e95eabfd9b011a507f4488
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
-Name: golang-%{provider}-%{project}-%{repo}
-Version: 0
-Release: 0.11.git%{shortcommit}%{?dist}
-Summary: VCloud Air API bindings for Golang
License: ASL 2.0
-URL: https://%{provider_prefix}
-Source0:
https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# If go_arches not defined fall through to implicit golang archs
-%if 0%{?go_arches:1}
-ExclusiveArch: %{go_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
-# If gccgo_arches does not fit or is not defined fall through to golang
-%ifarch 0%{?gccgo_arches}
-BuildRequires: gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires: golang
+URL: %{gourl}
+Source0: %{gosource}
+#
https://github.com/vmware/govcloudair/pull/41
+Patch0: 0001-Fix-formatting-of-Fatalf-messages.patch
+
+%if %{with check}
+# Tests
+BuildRequires: golang(gopkg.in/check.v1)
%endif
%description
-%{summary}
+%{common_description}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
-BuildRequires:
golang(github.com/cenkalti/backoff)
-BuildRequires: golang(gopkg.in/check.v1)
-%endif
-
-Requires:
golang(github.com/cenkalti/backoff)
-Requires: golang(gopkg.in/check.v1)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/testutil) = %{version}-%{release}
-Provides: golang(%{import_path}/types/v56) = %{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}
-%package unit-test
-Summary: Unit tests for %{name} package
-# If go_arches not defined fall through to implicit golang archs
-%if 0%{?go_arches:1}
-ExclusiveArch: %{go_arches}
-%else
-ExclusiveArch: %{ix86} x86_64 %{arm}
-%endif
-# If gccgo_arches does not fit or is not defined fall through to golang
-%ifarch 0%{?gccgo_arches}
-BuildRequires: gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires: golang
-%endif
-
-%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
+%forgeautosetup -p1
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp $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}
-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
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
+%goinstall
+%if %{with check}
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%ifarch 0%{?gccgo_arches}
-function gotest { %{gcc_go_test} "$@"; }
-%else
-%if 0%{?golang_test:1}
-function gotest { %{golang_test} "$@"; }
-%else
-function gotest { go test "$@"; }
-%endif
-%endif
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-gotest %{import_path}
+%gochecks
%endif
-%if 0%{?with_devel}
%files devel -f devel.file-list
-%copying LICENSE
-%doc Readme.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%dir %{gopath}/src/%{import_path}
-%endif
-
-%if 0%{?with_unit_test}
-%files unit-test -f unit-test.file-list
-%copying LICENSE
-%doc Readme.md
-%endif
+%license LICENSE
+%doc README.md
%changelog
+* Sat Apr 06 14:54:31 CEST 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> -
0.0.2-1.20190406gitdaf883c
+- Bump to commit daf883c2f1db1a1b08e3dc15b2a9f98c877a8d46 (#1695291)
+- Update to new Go packaging
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.11.git0d7be90
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 93e6e86..04d2202 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b3f013f78d2da8a1747cf26bbf499ab govcloudair-0d7be90.tar.gz
+SHA512 (govcloudair-daf883c2f1db1a1b08e3dc15b2a9f98c877a8d46.tar.gz) =
f9219124dfbf21e484528e94c3ebceca826888a018044afd1763e7ac2836720cf0474e30185761298b38d5263cbd9c3cc708e321c43c04669e3dba2905e072fb