- updated to 3.3.10

diff --git a/etcd.spec b/etcd.spec
index d7f1ea6cb7b7b76c0f81117ef200fd3acbcfe935..5d44247c8a7eae44e72674ff686e8652dd20b085 100644 (file)
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,13 +1,13 @@
-# git rev-parse --short v2.0.11
-%define                githash 777151f
+# git rev-parse --short v3.3.10
+%define                githash 27fc7e2
 Summary:       A highly-available key value store for shared configuration
 Name:          etcd
-Version:       2.0.11
+Version:       3.3.10
 Release:       1
 License:       Apache v2.0
 Group:         Daemons
 Source0:       https://github.com/coreos/etcd/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: e928ca4a227930ae17bcef5cdf5478da
+# Source0-md5: cae7a6e0a7e23548fc098e24282a6c8e
 Patch0:                nogit.patch
 URL:           https://github.com/coreos/etcd/
 BuildRequires: golang >= 1.2.1-3
@@ -41,6 +41,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE README.md Documentation/internal-protocol-versioning.md
+%doc LICENSE README.md Documentation/v2/internal-protocol-versioning.md
 %attr(755,root,root) %{_bindir}/etcd
 %attr(755,root,root) %{_bindir}/etcdctl

diff --git a/nogit.patch b/nogit.patch
index 77c0b2ce495d31bad77f61519697e414a3da700c..445e4d0409a9f7725d78907684c119959625a519 100644 (file)
--- a/nogit.patch
+++ b/nogit.patch
@@ -1,11 +1,11 @@
 --- etcd-2.0.11/build~ 2015-05-15 23:54:32.000000000 +0300
 +++ etcd-2.0.11/build  2015-05-30 09:37:00.739376624 +0300
 @@ -11,7 +11,7 @@
+ ORG_PATH="github.com/coreos"
+ REPO_PATH="${ORG_PATH}/etcd"
  
- eval $(go env)
- 
--GIT_SHA=`git rev-parse --short HEAD`
-+GIT_SHA=${GIT_SHA:-`git rev-parse --short HEAD`}
- 
- # Static compilation is useful when etcd is run in a container
- CGO_ENABLED=0 go build -a -installsuffix cgo -ldflags "-s -X ${REPO_PATH}/version.GitSHA ${GIT_SHA}" -o bin/etcd ${REPO_PATH}
+-GIT_SHA=$(git rev-parse --short HEAD || echo "GitNotFound")
++GIT_SHA=${GIT_SHA:-`git rev-parse --short HEAD || echo "GitNotFound"`}
+ if [ ! -z "$FAILPOINTS" ]; then
+       GIT_SHA="$GIT_SHA"-FAILPOINTS
+ fi