[etcd/f20] Merge origin/master in f20 to get repos back in sync

[Eric Paris]

commit 9e1755b34a6e7599b3ac615712b942d06955ac47
Author: Eric Paris <eparis at redhat.com>
Date:   Tue Mar 10 13:00:57 2015 -0400

    Merge origin/master in f20 to get repos back in sync

 etcd.conf    |  2 +-
 etcd.service |  3 +--
 etcd.spec    | 21 +++++++++------------
 3 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/etcd.conf b/etcd.conf
index 37a53ea..086b740 100644
--- a/etcd.conf
+++ b/etcd.conf
@@ -5,7 +5,7 @@ ETCD_DATA_DIR="/var/lib/etcd/default.etcd"
 #ETCD_HEARTBEAT_INTERVAL="100"
 #ETCD_ELECTION_TIMEOUT="1000"
 #ETCD_LISTEN_PEER_URLS="http://localhost:2380,http://localhost:7001"
-#ETCD_LISTEN_CLIENT_URLS="http://localhost:2379,http://localhost:4001"
+ETCD_LISTEN_CLIENT_URLS="http://localhost:4001"
 #ETCD_MAX_SNAPSHOTS="5"
 #ETCD_MAX_WALS="5"
 #ETCD_CORS=""
diff --git a/etcd.service b/etcd.service
index 55c1bba..7b8169a 100644
--- a/etcd.service
+++ b/etcd.service
@@ -4,8 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-# etc logs to the journal directly, suppress double logging
-StandardOutput=null
+WorkingDirectory=/var/lib/etcd/
 EnvironmentFile=-/etc/etcd/etcd.conf
 User=etcd
 ExecStart=/usr/bin/etcd
diff --git a/etcd.spec b/etcd.spec
index 21ce879..ac501cd 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,6 +1,5 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
-#%global _dwz_low_mem_die_limit 0
-%global debug_package   %{nil}
+%global _dwz_low_mem_die_limit 0
 %global provider        github
 %global provider_tld    com
 %global project         coreos
@@ -11,7 +10,7 @@
 
 Name:		%{repo}
 Version:	2.0.3
-Release:	0.1%{?dist}
+Release:	0.2%{?dist}
 Summary:	A highly-available key value store for shared configuration
 License:	ASL 2.0
 URL:		https://%{import_path}
@@ -104,13 +103,10 @@ ln -s ../../../ src/github.com/coreos/etcd
 
 export GOPATH=$(pwd):%{gopath}:$GOPATH
 # *** 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')" -v -x "$@"; }
-#gobuild -o bin/etcd %{import_path}
-#gobuild -o bin/etcdctl %{import_path}/etcdctl
-#gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
-go build -v -x -o bin/etcd %{import_path}
-go build -a -ldflags '-s' -o bin/etcdctl %{import_path}/etcdctl
-go build -v -x -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
+function gobuild { go build -a -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" -v -x "$@"; }
+gobuild -o bin/etcd %{import_path}
+gobuild -o bin/etcdctl %{import_path}/etcdctl
+gobuild -o bin/etcd-migrate %{import_path}/tools/%{name}-migrate
 
 
 %install
@@ -189,10 +185,11 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
 %{gopath}/src/%{import_path}
 
 %changelog
+* Tue Mar 10 2015 Eric Paris <eparis at redhat.com> - 2.0.3-0.2
+- Fix .service files to work if no config file
+
 * Fri Feb 20 2015 jchaloup <jchaloup at redhat.com> - 2.0.3-0.1
 - Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876
-  remove debug info until 1196571 is resolved
-  related: #1191441
 
 * Wed Feb 18 2015 jchaloup <jchaloup at redhat.com> - 2.0.1-0.2
 - Update configuration and service file