diff --git a/.etcd.metadata b/.etcd.metadata index b723170..ba870f3 100644 --- a/.etcd.metadata +++ b/.etcd.metadata @@ -1 +1 @@ -d2292db014dd5705a9a013004a8eef260973fc41 SOURCES/v2.2.2.tar.gz +73042f705d96f57cd4b222edc608bca1a881d73c SOURCES/v2.2.5.tar.gz diff --git a/.gitignore b/.gitignore index 2ff9bca..fab73a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v2.2.2.tar.gz +SOURCES/v2.2.5.tar.gz diff --git a/SOURCES/etcd.conf b/SOURCES/etcd.conf index 324a4ee..bc7bbbc 100644 --- a/SOURCES/etcd.conf +++ b/SOURCES/etcd.conf @@ -22,7 +22,6 @@ ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379" #ETCD_DISCOVERY_SRV="" #ETCD_DISCOVERY_FALLBACK="proxy" #ETCD_DISCOVERY_PROXY="" -#ETCD_STRICT_RECONFIG_CHECK="false" # #[proxy] #ETCD_PROXY="off" diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec index c3ca1c8..6293e5a 100644 --- a/SPECS/etcd.spec +++ b/SPECS/etcd.spec @@ -13,18 +13,19 @@ %global provider_tld com %global project coreos %global repo etcd -%global commit 6335fdc595ff03d27007db04e5b545189b9647c6 +# https://github.com/coreos/etcd +%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path %{provider_prefix} +%global commit bc9ddf260115d2680191c46977ae72b837785472 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} - Name: %{repo} -Version: 2.2.2 -Release: 5%{?dist} +Version: 2.2.5 +Release: 1%{?dist} Summary: A highly-available key value store for shared configuration License: ASL 2.0 -URL: https://%{import_path} -Source0: https://%{import_path}/archive/v%{version}.tar.gz +URL: https://%{provider_prefix} +Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz Source1: %{name}.service Source2: %{name}.conf @@ -54,7 +55,6 @@ BuildRequires: golang(github.com/ugorji/go/codec) BuildRequires: golang(github.com/xiang90/probing) BuildRequires: golang(golang.org/x/crypto/bcrypt) BuildRequires: golang(golang.org/x/net/context) -BuildRequires: golang(golang.org/x/net/netutil) BuildRequires: golang(google.golang.org/grpc) %endif BuildRequires: systemd @@ -353,6 +353,13 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ %endif %changelog +* Thu Mar 03 2016 jchaloup - 2.2.5-1 +- Update to 2.2.5 + resolves: #1314351 + +* Fri Jan 08 2016 jchaloup - 2.2.2-6 +- -strict-reconfig-check flag not yet in v2.2.2 + * Tue Dec 29 2015 jchaloup - 2.2.2-5 - go < 1.5 needs "-installsuffix cgo" too to accept CGO_ENABLED