From 7a02a1c832e8f73dc67fc8b516640e80142b5ddd Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: May 22 2016 08:25:17 +0000
Subject: Update to 0.9.5.1

- related: #1250485

---

diff --git a/.gitignore b/.gitignore
index 4029ac2..fbdb0ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/influxdb-9485e99.tar.gz
+/influxdb-9eab563.tar.gz
diff --git a/golang-github-influxdb-influxdb.spec b/golang-github-influxdb-influxdb.spec
index 5edc2f7..0f866fe 100644
--- a/golang-github-influxdb-influxdb.spec
+++ b/golang-github-influxdb-influxdb.spec
@@ -19,20 +19,6 @@
 %global debug_package   %{nil}
 %endif
 
-%define copying() \
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7 \
-%license %{*} \
-%else \
-%doc %{*} \
-%endif
-
-%global isgccgoarch 0
-%if 0%{?gccgo_arches:1}
-%ifarch %{gccgo_arches}
-%global isgccgoarch 1
-%endif
-%endif
-
 %global provider        github
 %global provider_tld    com
 %global project         influxdb
@@ -40,29 +26,21 @@
 # https://github.com/influxdb/influxdb
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          9485e99796c53635fbf179b3e973c363937de00b
+%global commit          9eab56311373ee6f788ae5dfc87e2240038f0eb4
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           golang-%{provider}-%{project}-%{repo}
-Version:        0.8.5
-Release:        0.6.git%{shortcommit}%{?dist}
+Version:        0.9.5.1
+Release:        0.1.git%{shortcommit}%{?dist}
 Summary:        Scalable datastore for metrics, events, and real-time analytics
 License:        MIT
 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
-%if %{isgccgoarch}
-BuildRequires:   gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires:   golang
-%endif
+# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
+ExclusiveArch:  %{ix86} x86_64 %{arm} aarch64 ppc64le
+# 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}
 
 %description
 InfluxDB is an open source distributed time series database with no external
@@ -80,36 +58,6 @@ as it comes in and is immediately available in queries that should return
 in < 100ms.
 
 %if 0%{?with_devel}
-%package datastore
-Summary:        Golang datastore libs for influxdb
-BuildArch:      noarch
-
-%if 0%{?with_check}
-BuildRequires:  golang(code.google.com/p/goprotobuf/proto)
-BuildRequires:  golang(code.google.com/p/log4go)
-BuildRequires:  golang(github.com/BurntSushi/toml)
-BuildRequires:  golang(github.com/influxdb/gomdb)
-BuildRequires:  golang(github.com/jmhodges/levigo)
-#github.com/influxdb/rocksdb rocksdb not packaged in Fedora
-#github.com/influxdb/hyperleveldb-go hyperleveldb not packages in Fedora
-#launchpad.net/gocheck for tests but there is no check so far
-%endif
-
-Requires:  golang(code.google.com/p/goprotobuf/proto)
-Requires:  golang(code.google.com/p/log4go)
-Requires:  golang(github.com/BurntSushi/toml)
-Requires:  golang(github.com/influxdb/gomdb)
-Requires:  golang(github.com/jmhodges/levigo)
-
-Provides:       golang(%{import_path}/datastore) = %{version}-%{release}
-Provides:       golang(%{import_path}/datastore/storage) = %{version}-%{release}
-
-%description datastore
-%{%description}
-
-This package contains datastore part of influxdb.
-Hyperleveldb and rocksdb are not included is they are not packaged in Fedora.
-
 %package client
 Summary:        Golang client libs for influxdb
 BuildArch:      noarch
@@ -118,6 +66,9 @@ BuildArch:      noarch
 %endif
 
 Provides:       golang(%{import_path}/client) = %{version}-%{release}
+Provides:       golang(%{import_path}/client/v2) = %{version}-%{release}
+Provides:       golang(%{import_path}/models) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/escape) = %{version}-%{release}
 
 %description client
 %{%description}
@@ -129,58 +80,80 @@ Summary:       %{summary}
 BuildArch:     noarch
 
 %if 0%{?with_check}
-BuildRequires:  golang(code.google.com/p/log4go)
-BuildRequires:  golang(github.com/bmizerany/pat)
-BuildRequires:  golang(github.com/influxdb/go-cache)
 BuildRequires:  golang(github.com/BurntSushi/toml)
-BuildRequires:  golang(github.com/influxdb/gomdb)
-BuildRequires:  golang(github.com/jmhodges/levigo)
-BuildRequires:  golang(code.google.com/p/goprotobuf/proto)
-BuildRequires:  golang(github.com/stretchr/testify/assert)
-BuildRequires:  golang(github.com/stretchr/testify/mock)
-BuildRequires:  golang(github.com/rakyll/statik/fs)
-BuildRequires:  golang(github.com/dgnorton/goback)
+BuildRequires:  golang(github.com/bmizerany/pat)
+BuildRequires:  golang(github.com/boltdb/bolt)
+BuildRequires:  golang(github.com/dgryski/go-bits)
+BuildRequires:  golang(github.com/dgryski/go-bitstream)
+BuildRequires:  golang(github.com/gogo/protobuf/proto)
+BuildRequires:  golang(github.com/golang/snappy)
+BuildRequires:  golang(github.com/hashicorp/raft)
+BuildRequires:  golang(github.com/hashicorp/raft-boltdb)
+BuildRequires:  golang(github.com/influxdb/enterprise-client/v1)
+BuildRequires:  golang(github.com/jwilder/encoding/simple8b)
 BuildRequires:  golang(github.com/kimor79/gollectd)
+BuildRequires:  golang(github.com/peterh/liner)
+BuildRequires:  golang(github.com/rakyll/statik/fs)
+BuildRequires:  golang(golang.org/x/crypto/bcrypt)
+BuildRequires:  golang(gopkg.in/fatih/pool.v2)
 %endif
 
-Requires:       golang(%{import_path}/client) = %{version}-%{release}
-Requires:       golang(%{import_path}/datastore) = %{version}-%{release}
-Requires:       golang(code.google.com/p/log4go)
-Requires:       golang(github.com/bmizerany/pat)
-Requires:       golang(github.com/influxdb/go-cache)
+Requires:       %{name}-client = %{version}-%{release}
 Requires:       golang(github.com/BurntSushi/toml)
-Requires:       golang(github.com/influxdb/gomdb)
-Requires:       golang(github.com/jmhodges/levigo)
-Requires:       golang(code.google.com/p/goprotobuf/proto)
-Requires:       golang(github.com/stretchr/testify/assert)
-Requires:       golang(github.com/stretchr/testify/mock)
-Requires:       golang(github.com/rakyll/statik/fs)
-Requires:       golang(github.com/dgnorton/goback)
+Requires:       golang(github.com/bmizerany/pat)
+Requires:       golang(github.com/boltdb/bolt)
+#Requires:       golang(github.com/dgryski/go-bits)
+#Requires:       golang(github.com/dgryski/go-bitstream)
+Requires:       golang(github.com/gogo/protobuf/proto)
+Requires:       golang(github.com/golang/snappy)
+Requires:       golang(github.com/hashicorp/raft)
+Requires:       golang(github.com/hashicorp/raft-boltdb)
+#Requires:       golang(github.com/influxdb/enterprise-client/v1)
+#Requires:       golang(github.com/jwilder/encoding/simple8b)
 Requires:       golang(github.com/kimor79/gollectd)
+Requires:       golang(github.com/peterh/liner)
+Requires:       golang(github.com/rakyll/statik/fs)
+Requires:       golang(golang.org/x/crypto/bcrypt)
+Requires:       golang(gopkg.in/fatih/pool.v2)
 
-Provides:       golang(%{import_path}/admin) = %{version}-%{release}
-Provides:       golang(%{import_path}/api) = %{version}-%{release}
-Provides:       golang(%{import_path}/api/collectd) = %{version}-%{release}
-Provides:       golang(%{import_path}/api/graphite) = %{version}-%{release}
-Provides:       golang(%{import_path}/api/http) = %{version}-%{release}
-Provides:       golang(%{import_path}/api/udp) = %{version}-%{release}
-Provides:       golang(%{import_path}/checkers) = %{version}-%{release}
+Provides:       golang(%{import_path}) = %{version}-%{release}
 Provides:       golang(%{import_path}/cluster) = %{version}-%{release}
-Provides:       golang(%{import_path}/common) = %{version}-%{release}
-Provides:       golang(%{import_path}/configuration) = %{version}-%{release}
-Provides:       golang(%{import_path}/coordinator) = %{version}-%{release}
-Provides:       golang(%{import_path}/daemon) = %{version}-%{release}
-Provides:       golang(%{import_path}/engine) = %{version}-%{release}
-Provides:       golang(%{import_path}/integration) = %{version}-%{release}
-Provides:       golang(%{import_path}/integration/helpers) = %{version}-%{release}
-Provides:       golang(%{import_path}/metastore) = %{version}-%{release}
-Provides:       golang(%{import_path}/parser) = %{version}-%{release}
-Provides:       golang(%{import_path}/protocol) = %{version}-%{release}
-Provides:       golang(%{import_path}/server) = %{version}-%{release}
-Provides:       golang(%{import_path}/tools/benchmark-multi-series) = %{version}-%{release}
-Provides:       golang(%{import_path}/tools/benchmark-storage) = %{version}-%{release}
-Provides:       golang(%{import_path}/tools/benchmark) = %{version}-%{release}
-Provides:       golang(%{import_path}/wal) = %{version}-%{release}
+Provides:       golang(%{import_path}/cmd/influx/cli) = %{version}-%{release}
+Provides:       golang(%{import_path}/cmd/influxd/backup) = %{version}-%{release}
+Provides:       golang(%{import_path}/cmd/influxd/help) = %{version}-%{release}
+Provides:       golang(%{import_path}/cmd/influxd/restore) = %{version}-%{release}
+Provides:       golang(%{import_path}/cmd/influxd/run) = %{version}-%{release}
+Provides:       golang(%{import_path}/importer/v8) = %{version}-%{release}
+Provides:       golang(%{import_path}/influxql) = %{version}-%{release}
+Provides:       golang(%{import_path}/meta) = %{version}-%{release}
+Provides:       golang(%{import_path}/monitor) = %{version}-%{release}
+Provides:       golang(%{import_path}/pkg/slices) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/admin) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/collectd) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/continuous_querier) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/copier) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/graphite) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/hh) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/httpd) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/opentsdb) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/precreator) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/registration) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/retention) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/snapshotter) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/subscriber) = %{version}-%{release}
+Provides:       golang(%{import_path}/services/udp) = %{version}-%{release}
+Provides:       golang(%{import_path}/snapshot) = %{version}-%{release}
+Provides:       golang(%{import_path}/statik) = %{version}-%{release}
+Provides:       golang(%{import_path}/stress) = %{version}-%{release}
+Provides:       golang(%{import_path}/tcp) = %{version}-%{release}
+Provides:       golang(%{import_path}/toml) = %{version}-%{release}
+Provides:       golang(%{import_path}/tsdb) = %{version}-%{release}
+Provides:       golang(%{import_path}/tsdb/engine) = %{version}-%{release}
+Provides:       golang(%{import_path}/tsdb/engine/b1) = %{version}-%{release}
+Provides:       golang(%{import_path}/tsdb/engine/bz1) = %{version}-%{release}
+Provides:       golang(%{import_path}/tsdb/engine/tsm1) = %{version}-%{release}
+Provides:       golang(%{import_path}/tsdb/engine/wal) = %{version}-%{release}
+Provides:       golang(%{import_path}/uuid) = %{version}-%{release}
 
 %description devel
 InfluxDB is an open source distributed time series database with no external
@@ -205,26 +178,19 @@ building other packages which use import path with
 %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
-%if %{isgccgoarch}
-BuildRequires:   gcc-go >= %{gccgo_min_vers}
-%else
-BuildRequires:   golang
-%endif
+# 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}
+
+# test subpackage tests code from devel subpackage
+Requires:        %{name}-devel = %{version}-%{release}
 
 %if 0%{?with_check}
 #Here comes all BuildRequires: PACKAGE the unit tests
 #in %%check section need for running
+BuildRequires: golang(github.com/davecgh/go-spew/spew)
 %endif
 
-# test subpackage tests code from devel subpackage
-Requires:        %{name}-devel = %{version}-%{release}
+Requires:      golang(github.com/davecgh/go-spew/spew)
 
 %description unit-test
 %{summary}
@@ -242,90 +208,114 @@ providing packages with %{import_path} prefix.
 # 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" | grep -v "^./client" | grep -v "^./datastore" | grep -v "./_vendor") ; do
+for file in $(find . -iname "*.go" \! -iname "*_test.go" | grep -v -E "^./client|^./models|^./pkg/escape") ; 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
 # find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go" | grep "^./client") ; do
+for file in $(find . -iname "*.go" \! -iname "*_test.go" | grep -E "^./client|^./models|^./pkg/escape") ; do
+    echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> client_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" >> client_devel.file-list
 done
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go" | grep "^./datastore") ; 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" >> datastore_devel.file-list
-done
 %endif
 
 # testing files for this project
-%if 0%{?with_unit_test}
+%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" | grep -v "./_vendor"); do
+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
+
 %check
 %if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if %{isgccgoarch}
-function gotest { %{gcc_go_test} "$@"; }
-%else
-%if 0%{?golang_test:1}
-function gotest { %{golang_test} "$@"; }
+%if ! 0%{?with_bundled}
+export GOPATH=%{buildroot}/%{gopath}:%{gopath}
 %else
-function gotest { go test "$@"; }
+export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
 %endif
+
+%if ! 0%{?gotest:1}
+%global gotest go test
 %endif
 
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-gotest %{import_path}/admin
-gotest %{import_path}/api/collectd
-gotest %{import_path}/api/http
-gotest %{import_path}/cluster
-gotest %{import_path}/common
-gotest %{import_path}/configuration
-gotest %{import_path}/coordinator
-gotest %{import_path}/datastore
-gotest %{import_path}/engine
-gotest %{import_path}/integration
-gotest %{import_path}/parser
-gotest %{import_path}/protocol
-gotest %{import_path}/wal
+%gotest %{import_path}/client
+%gotest %{import_path}/client/v2
+%gotest %{import_path}/cluster
+%gotest %{import_path}/cmd/influx/cli
+%gotest %{import_path}/cmd/influxd/backup
+%gotest %{import_path}/cmd/influxd/restore
+%gotest %{import_path}/cmd/influxd/run
+%gotest %{import_path}/influxql
+%gotest %{import_path}/meta
+%gotest %{import_path}/models
+%gotest %{import_path}/monitor
+%gotest %{import_path}/pkg/escape
+%gotest %{import_path}/services/admin
+%gotest %{import_path}/services/collectd
+%gotest %{import_path}/services/continuous_querier
+%gotest %{import_path}/services/copier
+%gotest %{import_path}/services/graphite
+%gotest %{import_path}/services/hh
+%gotest %{import_path}/services/httpd
+%gotest %{import_path}/services/opentsdb
+%gotest %{import_path}/services/precreator
+%gotest %{import_path}/services/registration
+%gotest %{import_path}/services/retention
+%gotest %{import_path}/services/snapshotter
+%gotest %{import_path}/services/subscriber
+%gotest %{import_path}/services/udp
+%gotest %{import_path}/snapshot
+%gotest %{import_path}/stress
+%gotest %{import_path}/tcp
+%gotest %{import_path}/toml
+%gotest %{import_path}/tsdb
+%gotest %{import_path}/tsdb/engine/b1
+%gotest %{import_path}/tsdb/engine/bz1
+%gotest %{import_path}/tsdb/engine/tsm1
+%gotest %{import_path}/tsdb/engine/wal
 %endif
 
+#define license tag if not already defined
+%{!?_licensedir:%global license %doc}
+
 %if 0%{?with_devel}
 %files client -f client_devel.file-list
-%copying LICENSE
-%doc CHANGELOG.md README.md Makefile.in Gemfile
+%license LICENSE
+%doc *.md
 %dir %{gopath}/src/%{import_path}/client
 
-%files datastore -f datastore_devel.file-list
-%copying LICENSE
-%doc CHANGELOG.md README.md Makefile.in Gemfile
-%dir %{gopath}/src/%{import_path}/datastore
-
 %files devel -f devel.file-list
-%copying LICENSE
-%doc CHANGELOG.md README.md
+%license LICENSE
+%doc *.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 CHANGELOG.md README.md
+%license LICENSE
+%doc *.md
 %endif
 
 %changelog
+* Sun May 22 2016 jchaloup <jchaloup@redhat.com> - 0.9.5.1-0.1.git9eab563
+- Update to 0.9.5.1
+  related: #1250485
+
 * Mon Feb 22 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.5-0.6.git9485e99
 - https://fedoraproject.org/wiki/Changes/golang1.6
 
diff --git a/sources b/sources
index 910ef7c..8e2ba80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82a4f6ae71e0c19dec3cb2dcf10362b4  influxdb-9485e99.tar.gz
+45261a84e6d3d3f35a74b12dc217a17c  influxdb-9eab563.tar.gz