diff --git a/.etcd.metadata b/.etcd.metadata index 054f068..76d859c 100644 --- a/.etcd.metadata +++ b/.etcd.metadata @@ -1 +1 @@ -1202ec27380c42a36314a286bfaa5ae9877045cc SOURCES/v2.0.13.tar.gz +0c61e48db705cc7bc3e06f090f050c9467300bf2 SOURCES/v2.1.1.tar.gz diff --git a/.gitignore b/.gitignore index ea3bce9..382d39c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v2.0.13.tar.gz +SOURCES/v2.1.1.tar.gz diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec index 9d20b21..1660df7 100644 --- a/SPECS/etcd.spec +++ b/SPECS/etcd.spec @@ -13,13 +13,13 @@ %global provider_tld com %global project coreos %global repo etcd -%global commit 92e3895214265d213de5b1ff55cddf482f0d1ed5 +%global commit 6335fdc595ff03d27007db04e5b545189b9647c6 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} Name: %{repo} -Version: 2.0.13 +Version: 2.1.1 Release: 2%{?dist} Summary: A highly-available key value store for shared configuration License: ASL 2.0 @@ -28,23 +28,28 @@ Source0: https://%{import_path}/archive/v%{version}.tar.gz Source1: %{name}.service Source2: %{name}.conf -%if ! 0%{?with_bundled} -Patch0: etcd-2.0.1-Replace-depricated-ErrWrongType-with-its-local-defin.patch -%else -Patch0: don-t-set-GIT_SHA-in-build-script.patch -%endif - -Patch1: set-etcd-advertise-client-urls-if-needed.patch +Patch0: don-t-set-GIT_SHA-in-build-script.patch +Patch1: set-etcd-advertise-client-urls-if-needed.patch ExclusiveArch: %{ix86} x86_64 %{arm} BuildRequires: golang >= 1.2.1-3 %if ! 0%{?with_bundled} -BuildRequires: golang(code.google.com/p/gogoprotobuf/proto) -BuildRequires: golang(github.com/codegangsta/cli) -BuildRequires: golang(github.com/coreos/go-etcd/etcd) -BuildRequires: golang(github.com/jonboulle/clockwork) -BuildRequires: golang(github.com/stretchr/testify/assert) -BuildRequires: golang(golang.org/x/net/context) +BuildRequires: golang(github.com/bgentry/speakeasy) +BuildRequires: golang(github.com/boltdb/bolt) +BuildRequires: golang(github.com/codegangsta/cli) +BuildRequires: golang(github.com/coreos/go-etcd/etcd) +BuildRequires: golang(github.com/coreos/go-semver/semver) +BuildRequires: golang(github.com/coreos/pkg/capnslog) +BuildRequires: golang(github.com/gogo/protobuf/proto) +BuildRequires: golang(github.com/google/btree) +BuildRequires: golang(github.com/jonboulle/clockwork) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus) +BuildRequires: golang(github.com/prometheus/procfs) +BuildRequires: golang(github.com/stretchr/testify/assert) +BuildRequires: golang(golang.org/x/crypto/bcrypt) +# tools/functional-tester/etcd-tester/cluster.go:main +#BuildRequires: golang(golang.org/x/net/context) +BuildRequires: golang(google.golang.org/grpc) %endif BuildRequires: systemd Requires(pre): shadow-utils @@ -58,41 +63,58 @@ A highly-available key value store for shared configuration. %if 0%{?with_devel} %package devel BuildRequires: golang >= 1.2.1-3 -BuildRequires: golang(code.google.com/p/gogoprotobuf/proto) -BuildRequires: golang(github.com/codegangsta/cli) -BuildRequires: golang(github.com/coreos/go-etcd/etcd) -BuildRequires: golang(golang.org/x/net/context) +BuildRequires: golang(github.com/bgentry/speakeasy) +BuildRequires: golang(github.com/boltdb/bolt) +BuildRequires: golang(github.com/coreos/go-etcd/etcd) +BuildRequires: golang(github.com/coreos/go-semver/semver) +BuildRequires: golang(github.com/coreos/pkg/capnslog) +BuildRequires: golang(github.com/gogo/protobuf/proto) +BuildRequires: golang(github.com/google/btree) BuildRequires: golang(github.com/jonboulle/clockwork) +BuildRequires: golang(github.com/prometheus/client_golang/prometheus) +BuildRequires: golang(github.com/prometheus/procfs) BuildRequires: golang(github.com/stretchr/testify/assert) -Requires: golang(code.google.com/p/gogoprotobuf/proto) -Requires: golang(github.com/codegangsta/cli) +BuildRequires: golang(golang.org/x/crypto/bcrypt) +BuildRequires: golang(google.golang.org/grpc) + +Requires: golang(github.com/bgentry/speakeasy) +Requires: golang(github.com/boltdb/bolt) Requires: golang(github.com/coreos/go-etcd/etcd) -Requires: golang(golang.org/x/net/context) +Requires: golang(github.com/coreos/go-semver/semver) +Requires: golang(github.com/coreos/pkg/capnslog) +Requires: golang(github.com/gogo/protobuf/proto) +Requires: golang(github.com/google/btree) Requires: golang(github.com/jonboulle/clockwork) +Requires: golang(github.com/prometheus/client_golang/prometheus) +Requires: golang(github.com/prometheus/procfs) Requires: golang(github.com/stretchr/testify/assert) +Requires: golang(golang.org/x/crypto/bcrypt) +Requires: golang(google.golang.org/grpc) + Provides: golang(%{import_path}/client) = %{version}-%{release} Provides: golang(%{import_path}/discovery) = %{version}-%{release} Provides: golang(%{import_path}/error) = %{version}-%{release} Provides: golang(%{import_path}/etcdctl/command) = %{version}-%{release} Provides: golang(%{import_path}/etcdmain) = %{version}-%{release} Provides: golang(%{import_path}/etcdserver) = %{version}-%{release} +Provides: golang(%{import_path}/etcdserver/auth) = %{version}-%{release} Provides: golang(%{import_path}/etcdserver/etcdhttp) = %{version}-%{release} Provides: golang(%{import_path}/etcdserver/etcdhttp/httptypes) = %{version}-%{release} Provides: golang(%{import_path}/etcdserver/etcdserverpb) = %{version}-%{release} Provides: golang(%{import_path}/etcdserver/stats) = %{version}-%{release} Provides: golang(%{import_path}/integration) = %{version}-%{release} Provides: golang(%{import_path}/migrate) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/coreos) = %{version}-%{release} +Provides: golang(%{import_path}/migrate/etcd4pb) = %{version}-%{release} Provides: golang(%{import_path}/pkg/cors) = %{version}-%{release} Provides: golang(%{import_path}/pkg/crc) = %{version}-%{release} Provides: golang(%{import_path}/pkg/fileutil) = %{version}-%{release} Provides: golang(%{import_path}/pkg/flags) = %{version}-%{release} Provides: golang(%{import_path}/pkg/idutil) = %{version}-%{release} Provides: golang(%{import_path}/pkg/ioutil) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/metrics) = %{version}-%{release} Provides: golang(%{import_path}/pkg/netutil) = %{version}-%{release} Provides: golang(%{import_path}/pkg/osutil) = %{version}-%{release} Provides: golang(%{import_path}/pkg/pbutil) = %{version}-%{release} +Provides: golang(%{import_path}/pkg/runtime) = %{version}-%{release} Provides: golang(%{import_path}/pkg/testutil) = %{version}-%{release} Provides: golang(%{import_path}/pkg/timeutil) = %{version}-%{release} Provides: golang(%{import_path}/pkg/transport) = %{version}-%{release} @@ -105,7 +127,11 @@ Provides: golang(%{import_path}/raft/rafttest) = %{version}-%{release} Provides: golang(%{import_path}/rafthttp) = %{version}-%{release} Provides: golang(%{import_path}/snap) = %{version}-%{release} Provides: golang(%{import_path}/snap/snappb) = %{version}-%{release} +Provides: golang(%{import_path}/storage) = %{version}-%{release} +Provides: golang(%{import_path}/storage/backend) = %{version}-%{release} +Provides: golang(%{import_path}/storage/storagepb) = %{version}-%{release} Provides: golang(%{import_path}/store) = %{version}-%{release} +Provides: golang(%{import_path}/tools/functional-tester/etcd-agent/client) = %{version}-%{release} Provides: golang(%{import_path}/version) = %{version}-%{release} Provides: golang(%{import_path}/wal) = %{version}-%{release} Provides: golang(%{import_path}/wal/walpb) = %{version}-%{release} @@ -137,13 +163,13 @@ find . -name "*.go" \ mkdir -p src/github.com/coreos ln -s ../../../ src/github.com/coreos/etcd -export GOPATH=$(pwd):%{gopath}:$GOPATH +export GOPATH=$(pwd):%{gopath} %if 0%{?with_debug} # *** ERROR: No build ID note found in /.../BUILDROOT/etcd-2.0.0-1.rc1.fc22.x86_64/usr/bin/etcd -function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -s -X %{import_path}/version.GitSHA %{shortcommit}" -v -x "$@"; } +function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -X %{import_path}/version.GitSHA %{shortcommit}" -v -x "$@"; } %else -function gobuild { go build -a "$@" -ldflags "-s -X %{import_path}/version.GitSHA %{shortcommit}"; } +function gobuild { go build -a -ldflags "-X %{import_path}/version.GitSHA %{shortcommit}" "$@"; } %endif gobuild -o bin/etcd %{import_path} @@ -176,8 +202,8 @@ install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name} install -d %{buildroot}/%{gopath}/src/%{import_path} cp -pav main.go %{buildroot}/%{gopath}/src/%{import_path}/ for dir in client discovery error etcdctl etcdmain etcdserver \ - migrate pkg proxy raft rafthttp snap store version wal \ - integration + integration migrate pkg proxy raft rafthttp snap storage \ + store tools version wal do cp -rpav ${dir} %{buildroot}/%{gopath}/src/%{import_path}/ done @@ -190,12 +216,13 @@ export GOPATH=$(pwd)/Godeps/_workspace:%{gopath} %else export GOPATH=%{buildroot}%{gopath}:%{gopath} %endif -go test %{import_path}/client +#go test %{import_path}/client go test %{import_path}/discovery go test %{import_path}/error go test %{import_path}/etcdctl/command go test %{import_path}/etcdmain #go test %{import_path}/etcdserver +go test %{import_path}/etcdserver/auth #go test %{import_path}/etcdserver/etcdhttp #go test %{import_path}/etcdserver/etcdhttp/httptypes #go test %{import_path}/integration @@ -206,7 +233,6 @@ go test %{import_path}/pkg/crc go test %{import_path}/pkg/flags go test %{import_path}/pkg/idutil go test %{import_path}/pkg/ioutil -go test %{import_path}/pkg/metrics go test %{import_path}/pkg/netutil go test %{import_path}/pkg/osutil go test %{import_path}/pkg/pbutil @@ -219,7 +245,10 @@ go test %{import_path}/raft #go test %{import_path}/raft/rafttest go test %{import_path}/rafthttp go test %{import_path}/snap +#go test %{import_path}/storage +#go test %{import_path}/storage/backend #go test %{import_path}/store +#go test %{import_path}/tools/functional-tester/etcd-agent go test %{import_path}/version go test %{import_path}/wal %endif @@ -261,15 +290,30 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ %endif %changelog -* Wed Jul 01 2015 jchaloup - 2.0.13-2 -- Set implicit value for ETCD_ADVERTISE_CLIENT_URLS if not set accordingly. +* Thu Jul 30 2015 jchaloup - 2.1.1-2 +- Update to v2.1.1 in RHEL + resolves: #1250707 + +* Mon Jul 20 2015 jchaloup - 2.1.1-1 +- fix definition of GOPATH for go1.5 +- fix definition of gobuild function for non-debug way +- Update to v2.1.1 + resolves: #1214958 + +* Fri Jul 10 2015 jchaloup - 2.0.13-3 +- set GOMAXPROCS to use all processors available + +* Mon Jun 29 2015 jchaloup - 2.0.13-2 +- Remove -s option from -ldflags string as it removes symbol table + 'go tool l6' gives explanation of all available options + resolves: #1236320 +- Set implicit value for ETCD_ADVERTISE_CLIENT_URLS if not set accordingly Config files of etcd < 2.0.11-2 does not set ETCD_ADVERTISE_CLIENT_URLS - if ETCD_LISTEN_CLIENT_URLS is. Causing etcd to fail when updated to newer etcd. + if ETCD_LISTEN_CLIENT_URLS is. Causing etcd to fail when updated to newe resolves: #1236706 * Fri Jun 26 2015 jchaloup - 2.0.13-1 - Update to v2.0.13 - resolves: #1232142 * Thu Jun 25 2015 jchaloup - 2.0.12-2 - Add restart policy and set LimitNOFILE to/in etcd.service file @@ -281,26 +325,28 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ - Update to v2.0.12 - Polish spec file +* Wed Jun 17 2015 Fedora Release Engineering - 2.0.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri May 22 2015 jchaloup - 2.0.11-2 - ETCD_ADVERTISE_CLIENT_URLS has to be set if ETCD_LISTEN_CLIENT_URLS is - set GOMAXPROCS to use all processors available - related: #1223388 + related: #1222416 -* Wed May 20 2015 jchaloup - 2.0.11-1 -- Update to etcd-2.0.11 - resolves: #1223388 +* Mon May 18 2015 jchaloup - 2.0.11-1 +- Update to v2.0.11 + resolves: #1222416 -* Wed Apr 08 2015 jchaloup - 2.0.9-2 -- No debug info - related: #1199223 +* Thu Apr 23 2015 jchaloup - 2.0.10-1 +- Update to v2.0.10 + resolves: #1214705 * Wed Apr 08 2015 jchaloup - 2.0.9-1 - Update to v2.0.9 - related: #1199223 + resolves: #1209666 * Fri Apr 03 2015 jchaloup - 2.0.8-0.2 - Update spec file to fit for rhel too (thanks to eparis) - resolves: #1199223 + related: #1207881 * Wed Apr 01 2015 jchaloup - 2.0.8-0.1 - Update to v2.0.8