From c5056e8d37aa0b8dabedfa781e7d00d84ff7deea Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 25 2015 09:39:40 +0000
Subject: import etcd-0.4.6-0.13.el7


---

diff --git a/.etcd.metadata b/.etcd.metadata
index c8121da..040093c 100644
--- a/.etcd.metadata
+++ b/.etcd.metadata
@@ -1 +1,2 @@
 80b405fd01527eea6668fde0186ca6b119c1185c SOURCES/etcd-0.4.6.tar.gz
+924668c26a30bfe65ac88971965b1dad819be630 SOURCES/etcdctl-0.4.6.tar.gz
diff --git a/.gitignore b/.gitignore
index 38921e2..60a3728 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 SOURCES/etcd-0.4.6.tar.gz
+SOURCES/etcdctl-0.4.6.tar.gz
diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec
index 1b71526..05a4f93 100644
--- a/SPECS/etcd.spec
+++ b/SPECS/etcd.spec
@@ -13,14 +13,15 @@
 
 Name:		etcd
 Version:	0.4.6
-Release:	0.12%{?dist}
+Release:	0.13%{?dist}
 Summary:	A highly-available key value store for shared configuration
 
 License:	ASL 2.0
 URL:		https://github.com/coreos/etcd/
 Source0:	https://github.com/coreos/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
-Source1:	etcd.service
-Source2:	etcd.conf
+Source1:	httpd://github.com/coreos/etcdctl/archive/v%{version}/etcdctl-%{version}.tar.gz
+Source2:	etcd.service
+Source3:	etcd.conf
 
 ExclusiveArch:	x86_64
 
@@ -36,24 +37,25 @@ Requires(postun): systemd
 A highly-available key value store for shared configuration.
 
 %prep
-%setup -q -n %{name}-%{version}
-
-# Make link for etcd itself
-mkdir -p src/github.com/coreos
-ln -s ../../../ src/github.com/coreos/etcd
+%setup -q -n %{name}-%{version} -a 1
 
 %build
 ./build
+cd etcdctl-%{version}
+./build
 
 %install
+
 install -d -m 0755 %{buildroot}%{_sysconfdir}/etcd
-install -m 644 -t %{buildroot}%{_sysconfdir}/etcd %{SOURCE2}
+install -m 644 -t %{buildroot}%{_sysconfdir}/etcd %{SOURCE3}
 install -D -p -m 0755 bin/etcd %{buildroot}%{_bindir}/etcd
-install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
 
 # And create /var/lib/etcd
 install -d -m 0755 %{buildroot}%{_localstatedir}/lib/etcd
 
+install -D -p -m 0755 etcdctl-%{version}/bin/etcdctl  %{buildroot}%{_bindir}/etcdctl
+
 %check
 # empty for now
 
@@ -73,11 +75,17 @@ getent passwd etcd >/dev/null || useradd -r -g etcd -d %{_localstatedir}/lib/etc
 %files
 %config(noreplace) %{_sysconfdir}/etcd
 %{_bindir}/etcd
+%{_bindir}/etcdctl
 %dir %attr(-,etcd,etcd) %{_localstatedir}/lib/etcd
 %{_unitdir}/%{name}.service
 %doc LICENSE README.md Documentation/internal-protocol-versioning.md
 
 %changelog
+* Tue Jan 27 2015 Eric Paris <eparis@redhat.com> - 0.4.6-0.13
+- build and include etcdctl
+- return etcd tarball to sources
+  resolves: #1186439
+
 * Wed Jan 21 2015 Eric Paris <eparis@redhat.com> - 0.4.6-0.12
 - set config to use /var/lib/etcd/default.etcd/ for storeage (like 2.0 will use)