The package rpms/golang-google-golangorg-cloud.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-google-golangorg-cloud.git....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 36b4a98da9a437142d3d93436a8ab36eced1eb80
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 14:59:07 2018 +0200
Bootstrap needed to avoid circular dep with
golang.org/x/build
diff --git a/golang-google-golangorg-cloud.spec b/golang-google-golangorg-cloud.spec
index 29ff4fb..dceddb7 100644
--- a/golang-google-golangorg-cloud.spec
+++ b/golang-google-golangorg-cloud.spec
@@ -1,3 +1,5 @@
+# Bootstrap needed to avoid circular dep with
golang.org/x/build
+%bcond_without bootstrap
# Run tests in check
# Disabled for bootstrapping of golang-googlecode-goauth2
%bcond_with check
@@ -44,9 +46,11 @@ BuildRequires: golang(go.opencensus.io/stats)
BuildRequires: golang(go.opencensus.io/stats/view)
BuildRequires: golang(go.opencensus.io/tag)
BuildRequires: golang(go.opencensus.io/trace)
+%if %{without bootstrap}
BuildRequires:
golang(golang.org/x/build/kubernetes)
BuildRequires:
golang(golang.org/x/build/kubernetes/api)
BuildRequires:
golang(golang.org/x/build/kubernetes/gke)
+%endif
BuildRequires:
golang(golang.org/x/debug)
BuildRequires:
golang(golang.org/x/debug/local)
BuildRequires:
golang(golang.org/x/net/context)
commit 7b2ed5d46213eeef1c1d5d8b75782b2561998246
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 13:36:34 2018 +0200
Upload tarball
diff --git a/.gitignore b/.gitignore
index c34e48d..ff50124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/google-cloud-go-872c736.tar.gz
+/google-cloud-go-0.21.0.tar.gz
diff --git a/sources b/sources
index 155ffb3..b801ef7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (google-cloud-go-872c736.tar.gz) =
032f83a570301a745eb0803447dfa8cd9007fba5627ff602cffd5c38aaa78be3d2696cc5fd1075dede3e1498f9ae68aa8c5b2afdaaaaeee8920144e0f1885854
+SHA512 (google-cloud-go-0.21.0.tar.gz) =
914c6096d07f9cd64149ab972d0fd8fe0d3bc458b9e3c32d1d3239255967be648e8f1bf67351f4b4144da37363a73477e84879ffde7c0925cd1a35806e16c5cd
commit 7c55b5bd2e9a3cdc2fd8fd2220d6b329304791c8
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 12:25:22 2018 +0200
Upload the patch
diff --git a/Increase-license-check-header-size-to-200.patch
b/Increase-license-check-header-size-to-200.patch
new file mode 100644
index 0000000..6850a14
--- /dev/null
+++ b/Increase-license-check-header-size-to-200.patch
@@ -0,0 +1,25 @@
+From 2bd30663482cb1e1e2a76d35b84f035d707e9932 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup(a)redhat.com>
+Date: Wed, 9 May 2018 12:04:59 +0200
+Subject: [PATCH] Increase license check header size to 200
+
+---
+ license_test.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/license_test.go b/license_test.go
+index f93e9e0..6b1a64c 100644
+--- a/license_test.go
++++ b/license_test.go
+@@ -53,7 +53,7 @@ func TestLicense(t *testing.T) {
+ if err != nil {
+ return nil
+ }
+- src = src[:140] // Ensure all of the sentinel values are at the top of the file.
++ src = src[:200] // Ensure all of the sentinel values are at the top of the file.
+
+ // Find license
+ for _, sentinel := range sentinels {
+--
+2.7.5
+
commit b4ec79eb86750de6263838a399777da6c05e9e8b
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed May 9 12:25:22 2018 +0200
Update to v0.21.0
Change import path prefix to
cloud.google.com/go
- resolves: #1558755
diff --git a/golang-google-golangorg-cloud.spec b/golang-google-golangorg-cloud.spec
index b20b658..29ff4fb 100644
--- a/golang-google-golangorg-cloud.spec
+++ b/golang-google-golangorg-cloud.spec
@@ -1,211 +1,161 @@
-# 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
-# Cyclic deps among cloud, grpc and oauth2
-%global with_check 0
-# 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
+# Run tests in check
+# Disabled for bootstrapping of golang-googlecode-goauth2
+%bcond_with check
+
+#
http://github.com/GoogleCloudPlatform/google-cloud-go
+%global forgeurl
https://github.com/GoogleCloudPlatform/google-cloud-go
+%global goipath
cloud.google.com/go
+%global gcommit 29f476ffa9c4cd4fd14336b6043090ac1ad76733
-%global provider github
-%global provider_tld com
-%global project GoogleCloudPlatform
-%global repo google-cloud-go
-#
https://github.com/GoogleCloudPlatform/google-cloud-go
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path
google.golang.org/cloud
-%global commit 872c736f496c2ba12786bedbb8325576bbdb33cf
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+Version: 0.21.0
+
+%gometa
Name: golang-google-golangorg-cloud
-Version: 0
-Release: 0.14.git%{shortcommit}%{?dist}
+Release: 1%{?dist}
Summary: Google Cloud Platform APIs related types and common functions
License: ASL 2.0
-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 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}
+URL: %{gourl}
+Source0: %{gosource}
+Patch0: Increase-license-check-header-size-to-200.patch
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
+BuildRequires:
golang(github.com/golang/mock/gomock)
BuildRequires:
golang(github.com/golang/protobuf/proto)
+BuildRequires:
golang(github.com/golang/protobuf/ptypes)
+BuildRequires:
golang(github.com/golang/protobuf/ptypes/any)
+BuildRequires:
golang(github.com/golang/protobuf/ptypes/duration)
+BuildRequires:
golang(github.com/golang/protobuf/ptypes/empty)
+BuildRequires:
golang(github.com/golang/protobuf/ptypes/struct)
+BuildRequires:
golang(github.com/golang/protobuf/ptypes/timestamp)
+BuildRequires:
golang(github.com/golang/protobuf/ptypes/wrappers)
+BuildRequires:
golang(github.com/google/btree)
+BuildRequires:
golang(github.com/google/go-cmp/cmp)
+BuildRequires:
golang(github.com/google/pprof/profile)
+BuildRequires:
golang(github.com/googleapis/gax-go)
+BuildRequires: golang(go.opencensus.io/plugin/ocgrpc)
+BuildRequires: golang(go.opencensus.io/stats)
+BuildRequires: golang(go.opencensus.io/stats/view)
+BuildRequires: golang(go.opencensus.io/tag)
+BuildRequires: golang(go.opencensus.io/trace)
+BuildRequires:
golang(golang.org/x/build/kubernetes)
+BuildRequires:
golang(golang.org/x/build/kubernetes/api)
+BuildRequires:
golang(golang.org/x/build/kubernetes/gke)
+BuildRequires:
golang(golang.org/x/debug)
+BuildRequires:
golang(golang.org/x/debug/local)
BuildRequires:
golang(golang.org/x/net/context)
-# cyclic deps among cloud, grpc and oauth2
+BuildRequires:
golang(golang.org/x/net/context/ctxhttp)
BuildRequires:
golang(golang.org/x/oauth2)
BuildRequires:
golang(golang.org/x/oauth2/google)
+BuildRequires:
golang(golang.org/x/oauth2/jwt)
+BuildRequires:
golang(golang.org/x/sync/errgroup)
+BuildRequires:
golang(golang.org/x/sync/semaphore)
+BuildRequires:
golang(golang.org/x/text/language)
+BuildRequires:
golang(golang.org/x/time/rate)
BuildRequires:
golang(google.golang.org/api/bigquery/v2)
+BuildRequires:
golang(google.golang.org/api/cloudbuild/v1)
+BuildRequires:
golang(google.golang.org/api/clouddebugger/v2)
+BuildRequires:
golang(google.golang.org/api/cloudresourcemanager/v1)
+BuildRequires:
golang(google.golang.org/api/cloudtrace/v1)
+BuildRequires:
golang(google.golang.org/api/compute/v1)
BuildRequires:
golang(google.golang.org/api/container/v1)
+BuildRequires:
golang(google.golang.org/api/gensupport)
BuildRequires:
golang(google.golang.org/api/googleapi)
-BuildRequires:
golang(google.golang.org/api/logging/v1beta3)
-BuildRequires:
golang(google.golang.org/api/pubsub/v1)
+BuildRequires:
golang(google.golang.org/api/iterator)
+BuildRequires:
golang(google.golang.org/api/option)
BuildRequires:
golang(google.golang.org/api/storage/v1)
-BuildRequires:
golang(google.golang.org/appengine)
-BuildRequires:
golang(google.golang.org/appengine/file)
-BuildRequires:
golang(google.golang.org/appengine/log)
+BuildRequires:
golang(google.golang.org/api/support/bundler)
+BuildRequires:
golang(google.golang.org/api/transport)
+BuildRequires:
golang(google.golang.org/api/transport/grpc)
+BuildRequires:
golang(google.golang.org/api/transport/http)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/api/label)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/api/metric)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/api/monitoredres)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/appengine/logging/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/bigtable/admin/v2)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/bigtable/v2)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/audit)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/bigquery/datatransfer/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/dataproc/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/language/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/language/v1beta2)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/oslogin/common)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/oslogin/v1beta)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/speech/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/speech/v1beta1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/videointelligence/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/videointelligence/v1be...
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/videointelligence/v1be...
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/vision/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/cloud/vision/v1p1beta1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/container/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/datastore/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/devtools/clouddebugger/v2)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/devtools/clouderrorreporting...
+BuildRequires:
golang(google.golang.org/genproto/googleapis/devtools/cloudprofiler/v2)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/devtools/cloudtrace/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/devtools/cloudtrace/v2)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/firestore/v1beta1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/iam/admin/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/iam/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/logging/type)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/logging/v2)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/longrunning)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/monitoring/v3)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/privacy/dlp/v2)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/privacy/dlp/v2beta1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/privacy/dlp/v2beta2)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/pubsub/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/rpc/code)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/rpc/errdetails)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/rpc/status)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/spanner/admin/database/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/spanner/admin/instance/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/spanner/v1)
+BuildRequires:
golang(google.golang.org/genproto/googleapis/type/latlng)
+BuildRequires:
golang(google.golang.org/genproto/protobuf/field_mask)
BuildRequires:
golang(google.golang.org/grpc)
+BuildRequires:
golang(google.golang.org/grpc/codes)
BuildRequires:
golang(google.golang.org/grpc/credentials)
-BuildRequires:
golang(google.golang.org/grpc/credentials/oauth)
-%endif
-
-Requires:
golang(github.com/golang/protobuf/proto)
-Requires:
golang(golang.org/x/net/context)
-# cyclic deps among cloud, grpc and oauth2
-Requires:
golang(golang.org/x/oauth2)
-Requires:
golang(golang.org/x/oauth2/google)
-Requires:
golang(google.golang.org/api/bigquery/v2)
-Requires:
golang(google.golang.org/api/container/v1)
-Requires:
golang(google.golang.org/api/googleapi)
-Requires:
golang(google.golang.org/api/logging/v1beta3)
-Requires:
golang(google.golang.org/api/pubsub/v1)
-Requires:
golang(google.golang.org/api/storage/v1)
-Requires:
golang(google.golang.org/appengine)
-Requires:
golang(google.golang.org/appengine/file)
-Requires:
golang(google.golang.org/appengine/log)
-Requires:
golang(google.golang.org/grpc)
-Requires:
golang(google.golang.org/grpc/credentials)
-Requires:
golang(google.golang.org/grpc/credentials/oauth)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/bigquery) = %{version}-%{release}
-Provides: golang(%{import_path}/bigtable) = %{version}-%{release}
-Provides: golang(%{import_path}/bigtable/bttest) = %{version}-%{release}
-Provides: golang(%{import_path}/compute/metadata) = %{version}-%{release}
-Provides: golang(%{import_path}/container) = %{version}-%{release}
-Provides: golang(%{import_path}/datastore) = %{version}-%{release}
-Provides: golang(%{import_path}/examples/storage/appengine) = %{version}-%{release}
-Provides: golang(%{import_path}/logging) = %{version}-%{release}
-Provides: golang(%{import_path}/pubsub) = %{version}-%{release}
-Provides: golang(%{import_path}/storage) = %{version}-%{release}
+BuildRequires:
golang(google.golang.org/grpc/keepalive)
+BuildRequires:
golang(google.golang.org/grpc/metadata)
+BuildRequires:
golang(google.golang.org/grpc/status)
%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}
-%package unit-test
-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}
-
-%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
+%patch0 -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 -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}
-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 -pav $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}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-gotest %{import_path}
-gotest %{import_path}/bigquery
-gotest %{import_path}/bigtable
-gotest %{import_path}/datastore
-gotest %{import_path}/pubsub
-gotest %{import_path}/storage
+%gochecks
%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 CONTRIBUTING.md AUTHORS CONTRIBUTORS
-%dir %{gopath}/src/google.golang.org
-%dir %{gopath}/src/%{import_path}
-%endif
-
-%if 0%{?with_unit_test}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md CONTRIBUTING.md AUTHORS CONTRIBUTORS
-%endif
%changelog
+* Wed May 09 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0.21.0-1
+- Update to v0.21.0
+ Change import path prefix to
cloud.google.com/go
+ resolves: #1558755
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.14.git872c736
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
commit f4664cd9586fabd09cec4dbaf34858ad6e98f599
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Feb 7 15:04:09 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-google-golangorg-cloud.spec b/golang-google-golangorg-cloud.spec
index 32f0f14..b20b658 100644
--- a/golang-google-golangorg-cloud.spec
+++ b/golang-google-golangorg-cloud.spec
@@ -42,7 +42,7 @@
Name: golang-google-golangorg-cloud
Version: 0
-Release: 0.13.git%{shortcommit}%{?dist}
+Release: 0.14.git%{shortcommit}%{?dist}
Summary: Google Cloud Platform APIs related types and common functions
License: ASL 2.0
URL: https://%{provider_prefix}
@@ -206,6 +206,9 @@ gotest %{import_path}/storage
%endif
%changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.14.git872c736
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> -
0-0.13.git872c736
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild