From 58da1237d11289d62afb425bd01d933100d02890 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Apr 12 2020 13:36:35 +0000 Subject: Update to 0.65.0 Signed-off-by: Robert-André Mauchin --- diff --git a/.gitignore b/.gitignore index af1a88e..5163f6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /flux-0.28.0.tar.gz /flux-0.37.2.tar.gz +/flux-0.59.5.tar.gz +/flux-0.65.0.tar.gz diff --git a/golang-github-influxdata-flux.spec b/golang-github-influxdata-flux.spec index 9fe249d..b25b580 100644 --- a/golang-github-influxdata-flux.spec +++ b/golang-github-influxdata-flux.spec @@ -1,11 +1,11 @@ # Generated by go2rpm -%ifarch x86_64 +%ifnarch s390x %bcond_without check %endif # https://github.com/influxdata/flux %global goipath github.com/influxdata/flux -Version: 0.37.2 +Version: 0.65.0 %gometa @@ -20,45 +20,63 @@ independently of those.} %global gosupfiles "${flux[@]}" stdlib/testing/testdata/* stdlib/pandas_tests/testdata/* stdlib/strings/testdata/* Name: %{goname} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Lightweight scripting language for querying databases License: MIT URL: %{gourl} Source0: %{gosource} +BuildRequires: golang(cloud.google.com/go/bigtable) BuildRequires: golang(github.com/andreyvit/diff) BuildRequires: golang(github.com/apache/arrow/go/arrow) BuildRequires: golang(github.com/apache/arrow/go/arrow/array) +BuildRequires: golang(github.com/apache/arrow/go/arrow/bitutil) BuildRequires: golang(github.com/apache/arrow/go/arrow/math) BuildRequires: golang(github.com/apache/arrow/go/arrow/memory) +# BuildRequires: golang(github.com/benbjohnson/tmpl) BuildRequires: golang(github.com/c-bata/go-prompt) BuildRequires: golang(github.com/cespare/xxhash) BuildRequires: golang(github.com/dave/jennifer/jen) +BuildRequires: golang(github.com/eclipse/paho.mqtt.golang) BuildRequires: golang(github.com/go-sql-driver/mysql) +BuildRequires: golang(github.com/golang/geo/r1) +BuildRequires: golang(github.com/golang/geo/s1) +BuildRequires: golang(github.com/golang/geo/s2) +BuildRequires: golang(github.com/google/flatbuffers/go) BuildRequires: golang(github.com/google/go-cmp/cmp) BuildRequires: golang(github.com/google/go-cmp/cmp/cmpopts) +# BuildRequires: golang(github.com/goreleaser/goreleaser) +# BuildRequires: golang(github.com/influxdata/changelog) BuildRequires: golang(github.com/influxdata/line-protocol) +BuildRequires: golang(github.com/influxdata/promql) +BuildRequires: golang(github.com/influxdata/promql/pkg/labels) BuildRequires: golang(github.com/influxdata/tdigest) BuildRequires: golang(github.com/lib/pq) -BuildRequires: golang(github.com/Masterminds/semver) +BuildRequires: golang(github.com/mattn/go-sqlite3) +BuildRequires: golang(github.com/matttproud/golang_protobuf_extensions/pbutil) BuildRequires: golang(github.com/opentracing/opentracing-go) +BuildRequires: golang(github.com/opentracing/opentracing-go/log) BuildRequires: golang(github.com/pkg/errors) +BuildRequires: golang(github.com/prometheus/client_model/go) +BuildRequires: golang(github.com/prometheus/common/expfmt) +BuildRequires: golang(github.com/prometheus/common/model) BuildRequires: golang(github.com/satori/go.uuid) BuildRequires: golang(github.com/segmentio/kafka-go) BuildRequires: golang(github.com/spf13/cobra) +BuildRequires: golang(github.com/spf13/pflag) BuildRequires: golang(go.uber.org/zap) BuildRequires: golang(go.uber.org/zap/zapcore) BuildRequires: golang(go.uber.org/zap/zaptest) +BuildRequires: golang(golang.org/x/net/context) +BuildRequires: golang(golang.org/x/tools/go/packages) BuildRequires: golang(gonum.org/v1/gonum/floats) -BuildRequires: golang(gopkg.in/src-d/go-git.v4) -BuildRequires: golang(gopkg.in/src-d/go-git.v4/plumbing) -BuildRequires: golang(gopkg.in/src-d/go-git.v4/plumbing/object) +BuildRequires: golang(google.golang.org/api/option) +# BuildRequires: golang(honnef.co/go/tools/cmd/staticcheck) %if %{with check} # Tests BuildRequires: golang(github.com/DATA-DOG/go-sqlmock) -BuildRequires: golang(github.com/stretchr/testify/assert) %endif %description @@ -68,7 +86,9 @@ BuildRequires: golang(github.com/stretchr/testify/assert) %prep %goprep +rm -rf internal/tools mapfile -t flux <<< $(find . -iname "*.flux" -type f) +sed -i "s|github.com/influxdata/promql/v2|github.com/influxdata/promql|" $(find . -iname "*.go") %build for cmd in cmd/* ; do @@ -82,8 +102,8 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ %if %{with check} %check -# https://github.com/influxdata/flux/issues/1223 -%gocheck -d execute +%gocheck -t stdlib \ + -d execute %endif %files @@ -94,6 +114,9 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/ %gopkgfiles %changelog +* Sat Apr 04 21:27:23 CET 2020 Robert-André Mauchin - 0.65.0-1 +- Update to 0.65.0 + * Wed Jan 29 2020 Fedora Release Engineering - 0.37.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 8dac59a..376b49e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (flux-0.37.2.tar.gz) = c228186f80c24325e3dbd1d3ea928d1ffe102df07673a641d18b199d60b315db4307fd1eb00d503c61d55f2e5a81439ea49a80164b06eac74a5cb2048f24ffe6 +SHA512 (flux-0.65.0.tar.gz) = 2354c53fd724a62d21e54a127d7fabac9c8775c97c1a3f1fffb2802bed51f4f5ab869929945d2698a1aab8e4c5c05b99d3beb392cdbf163791866349a9cb81a1