The package rpms/golang-vitess.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-vitess.git/commit/?id=584f....
Change:
-%ifnarch %{ix86} %{arm}
Thanks.
Full change:
============
commit 584f76a2f1be72c3ba3dc6893ccae401d8b70b5d
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Thu Oct 1 16:49:06 2020 +0200
Update to 7.0.2
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 12dc0cf..9fe26ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/vitess-5.0.1.tar.gz
/vitess-7.0.0.tar.gz
/vitess-7.0.1.tar.gz
+/vitess-7.0.2.tar.gz
diff --git a/golang-vitess.spec b/golang-vitess.spec
index a68e006..1577dde 100644
--- a/golang-vitess.spec
+++ b/golang-vitess.spec
@@ -1,13 +1,11 @@
# Generated by go2rpm
-#
https://github.com/vitessio/vitess/issues/4971
-%ifnarch %{ix86} %{arm}
%bcond_without check
-%endif
+%global golang_arches x86_64 aarch64 ppc64le s390x
#
https://github.com/vitessio/vitess
%global goipath vitess.io/vitess
%global forgeurl
https://github.com/vitessio/vitess
-Version: 7.0.1
+Version: 7.0.2
%gometa
@@ -38,6 +36,7 @@ Patch0: 0001-Add-context.TODO-to-vitesstoponode.go.patch
# Go 1.15:
https://github.com/golang/go/issues/32479
Patch1: 0001-Convert-int-to-string-using-strconv.Itoa.patch
+
BuildRequires:
golang(cloud.google.com/go/storage)
BuildRequires:
golang(github.com/aws/aws-sdk-go/aws)
BuildRequires:
golang(github.com/aws/aws-sdk-go/aws/awserr)
@@ -66,7 +65,7 @@ BuildRequires:
golang(github.com/grpc-ecosystem/go-grpc-prometheus)
BuildRequires:
golang(github.com/hashicorp/consul/api)
BuildRequires:
golang(github.com/klauspost/pgzip)
BuildRequires:
golang(github.com/krishicks/yaml-patch)
-BuildRequires:
golang(github.com/minio/minio-go)
+BuildRequires:
golang(github.com/minio/minio-go/v6)
BuildRequires:
golang(github.com/olekukonko/tablewriter)
BuildRequires:
golang(github.com/opentracing-contrib/go-grpc)
BuildRequires:
golang(github.com/opentracing/opentracing-go)
@@ -156,6 +155,7 @@ BuildRequires: golang(k8s.io/apimachinery/pkg/util/yaml)
%patch1 -p1
sed -i "s|github.com/coreos/etcd|go.etcd.io/etcd|" $(find . -iname
"*.go" -type f)
sed -i "s|gotest.tools|gotest.tools/v3|" $(find . -iname "*.go" -type
f)
+sed -i "s|github.com/minio/minio-go|github.com/minio/minio-go/v6|" $(find .
-iname "*.go" -type f)
rm -rf go/trace/plugin_datadog.go
mv go/README.md README-go.md
@@ -203,8 +203,8 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
%gopkgfiles
%changelog
-* Sat Sep 05 12:47:56 CEST 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 7.0.1-1
-- Update to 7.0.1
+* Thu Oct 01 11:57:17 CEST 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 7.0.2-1
+- Update to 7.0.2
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0.1-3
- Second attempt - Rebuilt for
diff --git a/sources b/sources
index 61a686e..82f2ce3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vitess-7.0.1.tar.gz) =
b7be2cf9a48938908e28ae42e28e03ccb7e23751ad7d2d16fc1fc0e5cb0dc23b81516ccd1fa7ac5c6749eee45829e4871c321d1e437dac575f663356e18d6631
+SHA512 (vitess-7.0.2.tar.gz) =
fc6bcdf45cd65ad1bb3f7212471075fb7ae0803dd71a5d1b06c30cacef447e2da5d049cd62fa2ddcd2528ea3edc84ea1269676788007a869d9d4ab61daed64f5
commit 247d05536c1259ef72fb1f03e106d16957dc80d5
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Sat Sep 5 12:49:18 2020 +0200
Update to 7.0.1
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 4494ed3..12dc0cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/vitess-948c2518355749c076675c79f257b4acbf349852.tar.gz
/vitess-5.0.1.tar.gz
+/vitess-7.0.0.tar.gz
+/vitess-7.0.1.tar.gz
diff --git a/0001-Add-context.TODO-to-vitesstoponode.go.patch
b/0001-Add-context.TODO-to-vitesstoponode.go.patch
new file mode 100644
index 0000000..035c01a
--- /dev/null
+++ b/0001-Add-context.TODO-to-vitesstoponode.go.patch
@@ -0,0 +1,100 @@
+From c767a33415d76839b6ddaf8baa7b0372b8b41ecb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
+Date: Fri, 7 Aug 2020 18:05:23 +0200
+Subject: [PATCH] Add context.TODO() to vitesstoponode.go
+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>
+---
+ .../typed/topo/v1beta1/vitesstoponode.go | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git
a/go/vt/topo/k8stopo/client/clientset/versioned/typed/topo/v1beta1/vitesstoponode.go
b/go/vt/topo/k8stopo/client/clientset/versioned/typed/topo/v1beta1/vitesstoponode.go
+index c3193d482..8f097a4b3 100644
+--- a/go/vt/topo/k8stopo/client/clientset/versioned/typed/topo/v1beta1/vitesstoponode.go
++++ b/go/vt/topo/k8stopo/client/clientset/versioned/typed/topo/v1beta1/vitesstoponode.go
+@@ -19,6 +19,7 @@ limitations under the License.
+ package v1beta1
+
+ import (
++ "context"
+ "time"
+
+ v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+@@ -70,7 +71,7 @@ func (c *vitessTopoNodes) Get(name string, options v1.GetOptions)
(result *v1bet
+ Resource("vitesstoponodes").
+ Name(name).
+ VersionedParams(&options, scheme.ParameterCodec).
+- Do().
++ Do(context.TODO()).
+ Into(result)
+ return
+ }
+@@ -87,7 +88,7 @@ func (c *vitessTopoNodes) List(opts v1.ListOptions) (result
*v1beta1.VitessTopoN
+ Resource("vitesstoponodes").
+ VersionedParams(&opts, scheme.ParameterCodec).
+ Timeout(timeout).
+- Do().
++ Do(context.TODO()).
+ Into(result)
+ return
+ }
+@@ -104,7 +105,7 @@ func (c *vitessTopoNodes) Watch(opts v1.ListOptions)
(watch.Interface, error) {
+ Resource("vitesstoponodes").
+ VersionedParams(&opts, scheme.ParameterCodec).
+ Timeout(timeout).
+- Watch()
++ Watch(context.TODO())
+ }
+
+ // Create takes the representation of a vitessTopoNode and creates it. Returns the
server's representation of the vitessTopoNode, and an error, if there is any.
+@@ -114,7 +115,7 @@ func (c *vitessTopoNodes) Create(vitessTopoNode
*v1beta1.VitessTopoNode) (result
+ Namespace(c.ns).
+ Resource("vitesstoponodes").
+ Body(vitessTopoNode).
+- Do().
++ Do(context.TODO()).
+ Into(result)
+ return
+ }
+@@ -127,7 +128,7 @@ func (c *vitessTopoNodes) Update(vitessTopoNode
*v1beta1.VitessTopoNode) (result
+ Resource("vitesstoponodes").
+ Name(vitessTopoNode.Name).
+ Body(vitessTopoNode).
+- Do().
++ Do(context.TODO()).
+ Into(result)
+ return
+ }
+@@ -139,7 +140,7 @@ func (c *vitessTopoNodes) Delete(name string, options
*v1.DeleteOptions) error {
+ Resource("vitesstoponodes").
+ Name(name).
+ Body(options).
+- Do().
++ Do(context.TODO()).
+ Error()
+ }
+
+@@ -155,7 +156,7 @@ func (c *vitessTopoNodes) DeleteCollection(options *v1.DeleteOptions,
listOption
+ VersionedParams(&listOptions, scheme.ParameterCodec).
+ Timeout(timeout).
+ Body(options).
+- Do().
++ Do(context.TODO()).
+ Error()
+ }
+
+@@ -168,7 +169,7 @@ func (c *vitessTopoNodes) Patch(name string, pt types.PatchType, data
[]byte, su
+ SubResource(subresources...).
+ Name(name).
+ Body(data).
+- Do().
++ Do(context.TODO()).
+ Into(result)
+ return
+ }
+--
+2.26.2
+
diff --git a/0001-Convert-int-to-string-using-strconv.Itoa.patch
b/0001-Convert-int-to-string-using-strconv.Itoa.patch
new file mode 100644
index 0000000..28f6972
--- /dev/null
+++ b/0001-Convert-int-to-string-using-strconv.Itoa.patch
@@ -0,0 +1,70 @@
+From f88782a75092b60b7231dfbab594115830859737 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
+Date: Tue, 11 Aug 2020 01:00:32 +0200
+Subject: [PATCH] Convert int to string using strconv.Itoa
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+See
https://github.com/golang/go/issues/32479
+
+Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
+---
+ go/netutil/netutil_test.go | 3 ++-
+ go/vt/vtgate/vcursor_impl_test.go | 5 +++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/go/netutil/netutil_test.go b/go/netutil/netutil_test.go
+index 193237bec..2ef09c8f9 100644
+--- a/go/netutil/netutil_test.go
++++ b/go/netutil/netutil_test.go
+@@ -20,6 +20,7 @@ import (
+ "math/rand"
+ "net"
+ "reflect"
++ "strconv"
+ "testing"
+ )
+
+@@ -56,7 +57,7 @@ func testUniformity(t *testing.T, size int, margin float64) {
+ rand.Seed(1)
+ data := make([]*net.SRV, size)
+ for i := 0; i < size; i++ {
+- data[i] = &net.SRV{Target: string('a' + i), Weight: 1}
++ data[i] = &net.SRV{Target: string('a') + strconv.Itoa(i), Weight: 1}
+ }
+ checkDistribution(t, data, margin)
+ }
+diff --git a/go/vt/vtgate/vcursor_impl_test.go b/go/vt/vtgate/vcursor_impl_test.go
+index dd956f6b5..2beca4d32 100644
+--- a/go/vt/vtgate/vcursor_impl_test.go
++++ b/go/vt/vtgate/vcursor_impl_test.go
+@@ -3,6 +3,7 @@ package vtgate
+ import (
+ "context"
+ "encoding/hex"
++ "strconv"
+ "testing"
+
+ "vitess.io/vitess/go/vt/proto/vschema"
+@@ -237,7 +238,7 @@ func TestSetTarget(t *testing.T) {
+ }}
+
+ for i, tc := range tests {
+- t.Run(string(i)+"#"+tc.targetString, func(t *testing.T) {
++ t.Run(strconv.Itoa(i)+"#"+tc.targetString, func(t *testing.T) {
+ vc, _ := newVCursorImpl(context.Background(),
NewSafeSession(&vtgatepb.Session{InTransaction: true}), sqlparser.MarginComments{},
nil, nil, &fakeVSchemaOperator{vschema: tc.vschema}, tc.vschema, nil)
+ vc.vschema = tc.vschema
+ err := vc.SetTarget(tc.targetString)
+@@ -277,7 +278,7 @@ func TestPlanPrefixKey(t *testing.T) {
+ }}
+
+ for i, tc := range tests {
+- t.Run(string(i)+"#"+tc.targetString, func(t *testing.T) {
++ t.Run(strconv.Itoa(i)+"#"+tc.targetString, func(t *testing.T) {
+ ss := NewSafeSession(&vtgatepb.Session{InTransaction: false})
+ ss.SetTargetString(tc.targetString)
+ vc, err := newVCursorImpl(context.Background(), ss, sqlparser.MarginComments{}, nil,
nil, &fakeVSchemaOperator{vschema: tc.vschema}, tc.vschema,
srvtopo.NewResolver(&fakeTopoServer{}, nil, ""))
+--
+2.26.2
+
diff --git a/0001-Fix-int-overflow-due-to-use-math.MaxInt64.patch
b/0001-Fix-int-overflow-due-to-use-math.MaxInt64.patch
deleted file mode 100644
index a482bcb..0000000
--- a/0001-Fix-int-overflow-due-to-use-math.MaxInt64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 33ef09b56f4a7f4f0f86c477ec855066fffa6a86 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m(a)gmail.com>
-Date: Mon, 1 Jul 2019 21:37:52 +0200
-Subject: [PATCH] Fix int overflow due to use math.MaxInt64
-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>
----
- go/vt/throttler/throttler.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/go/vt/throttler/throttler.go b/go/vt/throttler/throttler.go
-index 4db59307e..7de631e4b 100644
---- a/go/vt/throttler/throttler.go
-+++ b/go/vt/throttler/throttler.go
-@@ -50,7 +50,7 @@ const (
-
- // MaxRateModuleDisabled can be set in NewThrottler() to disable throttling
- // by a fixed rate.
-- MaxRateModuleDisabled = math.MaxInt64
-+ MaxRateModuleDisabled = int64(math.MaxInt64)
-
- // InvalidMaxRate is a constant which will fail in a NewThrottler() call.
- // It should be used when returning maxRate in an error case.
-@@ -58,7 +58,7 @@ const (
-
- // ReplicationLagModuleDisabled can be set in NewThrottler() to disable
- // throttling based on the MySQL replication lag.
-- ReplicationLagModuleDisabled = math.MaxInt64
-+ ReplicationLagModuleDisabled = int64(math.MaxInt64)
-
- // InvalidMaxReplicationLag is a constant which will fail in a NewThrottler()
- // call. It should be used when returning maxReplicationlag in an error case.
---
-2.21.0
-
diff --git a/0002-Fix-int-overflow-due-to-use-math.MaxInt64.patch
b/0002-Fix-int-overflow-due-to-use-math.MaxInt64.patch
deleted file mode 100644
index 19d0ae3..0000000
--- a/0002-Fix-int-overflow-due-to-use-math.MaxInt64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up vitess-5.0.1/go/vt/vtgate/engine/memory_sort.go.orig
vitess-5.0.1/go/vt/vtgate/engine/memory_sort.go
---- vitess-5.0.1/go/vt/vtgate/engine/memory_sort.go.orig 2020-01-15 16:47:35.000000000
+0100
-+++ vitess-5.0.1/go/vt/vtgate/engine/memory_sort.go 2020-04-05 23:40:26.069269780 +0200
-@@ -171,7 +171,7 @@ func (ms *MemorySort) fetchCount(bindVar
- return 0, err
- }
- if resolved.IsNull() {
-- return math.MaxInt64, nil
-+ return math.MaxInt32, nil
- }
- num, err := sqltypes.ToUint64(resolved)
- if err != nil {
diff --git a/golang-vitess.spec b/golang-vitess.spec
index 41a5c96..a68e006 100644
--- a/golang-vitess.spec
+++ b/golang-vitess.spec
@@ -7,7 +7,7 @@
#
https://github.com/vitessio/vitess
%global goipath vitess.io/vitess
%global forgeurl
https://github.com/vitessio/vitess
-Version: 5.0.1
+Version: 7.0.1
%gometa
@@ -26,33 +26,40 @@ with an atomic cutover step that takes only a few seconds.}
README.md README-go.md
Name: %{goname}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: Database clustering system for horizontal scaling of MySQL
# Upstream license specification: MIT and Apache-2.0
License: MIT and ASL 2.0
URL: %{gourl}
Source0: %{gosource}
-# Fix int overflow due to use math.MaxInt64
-Patch0: 0001-Fix-int-overflow-due-to-use-math.MaxInt64.patch
-Patch1: 0002-Fix-int-overflow-due-to-use-math.MaxInt64.patch
-
+# Add context.TODO() to vitesstoponode.go
+Patch0: 0001-Add-context.TODO-to-vitesstoponode.go.patch
+# Go 1.15:
https://github.com/golang/go/issues/32479
+Patch1: 0001-Convert-int-to-string-using-strconv.Itoa.patch
BuildRequires:
golang(cloud.google.com/go/storage)
BuildRequires:
golang(github.com/aws/aws-sdk-go/aws)
+BuildRequires:
golang(github.com/aws/aws-sdk-go/aws/awserr)
+BuildRequires:
golang(github.com/aws/aws-sdk-go/aws/client)
+BuildRequires:
golang(github.com/aws/aws-sdk-go/aws/request)
BuildRequires:
golang(github.com/aws/aws-sdk-go/aws/session)
BuildRequires:
golang(github.com/aws/aws-sdk-go/service/s3)
+BuildRequires:
golang(github.com/aws/aws-sdk-go/service/s3/s3iface)
BuildRequires:
golang(github.com/aws/aws-sdk-go/service/s3/s3manager)
-BuildRequires:
golang(github.com/cespare/xxhash)
+BuildRequires:
golang(github.com/Azure/azure-storage-blob-go/azblob)
+BuildRequires:
golang(github.com/buger/jsonparser)
+BuildRequires:
golang(github.com/cespare/xxhash/v2)
BuildRequires:
golang(github.com/evanphx/json-patch)
BuildRequires:
golang(github.com/GeertJohan/go.rice)
BuildRequires:
golang(github.com/GeertJohan/go.rice/embedded)
+BuildRequires:
golang(github.com/go-sql-driver/mysql)
BuildRequires:
golang(github.com/gogo/protobuf/proto)
BuildRequires:
golang(github.com/golang/glog)
-BuildRequires:
golang(github.com/golang/mock/gomock)
BuildRequires:
golang(github.com/golang/protobuf/jsonpb)
BuildRequires:
golang(github.com/golang/protobuf/proto)
BuildRequires:
golang(github.com/golang/snappy)
+BuildRequires:
golang(github.com/google/go-cmp/cmp)
BuildRequires:
golang(github.com/gorilla/websocket)
BuildRequires:
golang(github.com/grpc-ecosystem/go-grpc-middleware)
BuildRequires:
golang(github.com/grpc-ecosystem/go-grpc-prometheus)
@@ -67,24 +74,29 @@ BuildRequires:
golang(github.com/pborman/uuid)
BuildRequires:
golang(github.com/pires/go-proxyproto)
BuildRequires:
golang(github.com/pkg/errors)
BuildRequires:
golang(github.com/prometheus/client_golang/prometheus)
+BuildRequires:
golang(github.com/prometheus/client_golang/prometheus/promauto)
BuildRequires:
golang(github.com/prometheus/client_golang/prometheus/promhttp)
BuildRequires:
golang(github.com/prometheus/common/log)
+BuildRequires:
golang(github.com/PuerkitoBio/goquery)
+BuildRequires:
golang(github.com/sirupsen/logrus)
BuildRequires:
golang(github.com/stretchr/testify/assert)
BuildRequires:
golang(github.com/stretchr/testify/require)
BuildRequires:
golang(github.com/tchap/go-patricia/patricia)
BuildRequires:
golang(github.com/uber/jaeger-client-go)
BuildRequires:
golang(github.com/uber/jaeger-client-go/config)
BuildRequires:
golang(github.com/z-division/go-zookeeper/zk)
+BuildRequires: golang(go.etcd.io/etcd/clientv3)
+BuildRequires: golang(go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes)
+BuildRequires: golang(go.etcd.io/etcd/mvcc/mvccpb)
+BuildRequires: golang(go.etcd.io/etcd/pkg/transport)
+BuildRequires:
golang(go.uber.org/ratelimit)
BuildRequires:
golang(golang.org/x/crypto/ssh/terminal)
BuildRequires:
golang(golang.org/x/net/context)
BuildRequires:
golang(golang.org/x/oauth2/google)
+BuildRequires:
golang(golang.org/x/sync/errgroup)
BuildRequires:
golang(golang.org/x/text/collate)
BuildRequires:
golang(golang.org/x/text/language)
BuildRequires:
golang(golang.org/x/time/rate)
-BuildRequires: golang(go.etcd.io/etcd/clientv3)
-BuildRequires: golang(go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes)
-BuildRequires: golang(go.etcd.io/etcd/mvcc/mvccpb)
-BuildRequires: golang(go.etcd.io/etcd/pkg/transport)
BuildRequires:
golang(google.golang.org/api/iterator)
BuildRequires:
golang(google.golang.org/api/option)
BuildRequires:
golang(google.golang.org/grpc)
@@ -96,9 +108,43 @@ BuildRequires:
golang(google.golang.org/grpc/keepalive)
BuildRequires:
golang(google.golang.org/grpc/metadata)
BuildRequires:
golang(google.golang.org/grpc/peer)
BuildRequires:
golang(google.golang.org/grpc/status)
+# needed by go/trace/plugin_datadog.go
+# BuildRequires: golang(gopkg.in/DataDog/dd-trace-go.v1/ddtrace/opentracer)
+# BuildRequires: golang(gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer)
BuildRequires: golang(gopkg.in/ldap.v2)
+BuildRequires: golang(gopkg.in/yaml.v2)
+BuildRequires: golang(k8s.io/apimachinery/pkg/api/errors)
+BuildRequires: golang(k8s.io/apimachinery/pkg/apis/meta/v1)
+BuildRequires: golang(k8s.io/apimachinery/pkg/fields)
+BuildRequires: golang(k8s.io/apimachinery/pkg/labels)
+BuildRequires: golang(k8s.io/apimachinery/pkg/runtime)
+BuildRequires: golang(k8s.io/apimachinery/pkg/runtime/schema)
+BuildRequires: golang(k8s.io/apimachinery/pkg/runtime/serializer)
+BuildRequires: golang(k8s.io/apimachinery/pkg/types)
+BuildRequires: golang(k8s.io/apimachinery/pkg/util/runtime)
+BuildRequires: golang(k8s.io/apimachinery/pkg/watch)
+BuildRequires: golang(k8s.io/client-go/discovery)
+BuildRequires: golang(k8s.io/client-go/discovery/fake)
+BuildRequires: golang(k8s.io/client-go/kubernetes)
+BuildRequires: golang(k8s.io/client-go/rest)
+BuildRequires: golang(k8s.io/client-go/testing)
+BuildRequires: golang(k8s.io/client-go/tools/cache)
+BuildRequires: golang(k8s.io/client-go/tools/clientcmd)
+BuildRequires: golang(k8s.io/client-go/util/flowcontrol)
+BuildRequires: golang(k8s.io/client-go/util/retry)
+BuildRequires: golang(sigs.k8s.io/yaml)
BuildRequires: openssl
+%if %{with check}
+# Tests
+BuildRequires:
golang(github.com/golang/mock/gomock)
+BuildRequires:
golang(github.com/magiconair/properties/assert)
+BuildRequires: golang(gotest.tools/v3/assert)
+BuildRequires: golang(k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1)
+BuildRequires: golang(k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset)
+BuildRequires: golang(k8s.io/apimachinery/pkg/util/yaml)
+%endif
+
%description
%{common_description}
@@ -108,9 +154,10 @@ BuildRequires: openssl
%goprep
%patch0 -p1
%patch1 -p1
+sed -i "s|github.com/coreos/etcd|go.etcd.io/etcd|" $(find . -iname
"*.go" -type f)
+sed -i "s|gotest.tools|gotest.tools/v3|" $(find . -iname "*.go" -type
f)
+rm -rf go/trace/plugin_datadog.go
mv go/README.md README-go.md
-find . -name "*.go" -exec sed -i
"s|github.com/coreos/etcd|go.etcd.io/etcd|" "{}" +;
-find . -name "*.go" -exec sed -i
"s|github.com/cespare/xxhash/v2|github.com/cespare/xxhash|" "{}" +;
%build
for cmd in $(find go/cmd/* -maxdepth 0 -type d); do
@@ -137,11 +184,14 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
-t go/vt/vttablet/tabletmanager \
-t go/vt/vttablet/tabletserver \
-t go/vt/vttablet/worker \
+ -d go/vt/withddl \
-t go/vt/worker \
-d go/vt/workflow/reshardingworkflowgen \
-d go/vt/wrangler \
-d go/vt/wrangler/testlib \
- -d go/vt/zkctl
+ -d go/vt/zkctl \
+ -d go/json2 \
+ -t go/test/endtoend
%endif
%files
@@ -153,6 +203,9 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
%gopkgfiles
%changelog
+* Sat Sep 05 12:47:56 CEST 2020 Robert-André Mauchin <zebob.m(a)gmail.com> - 7.0.1-1
+- Update to 7.0.1
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0.1-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index cb5294a..61a686e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vitess-5.0.1.tar.gz) =
29c4d72ebb30a570928912df282ebe1ad69d82a4ec7935080baac5a63a01bb56e2320ce5bfa8be7ae9650ceee793fc8d481caed8c81ddd32db52e165c01f7a79
+SHA512 (vitess-7.0.1.tar.gz) =
b7be2cf9a48938908e28ae42e28e03ccb7e23751ad7d2d16fc1fc0e5cb0dc23b81516ccd1fa7ac5c6749eee45829e4871c321d1e437dac575f663356e18d6631