commit 3301c67ce5d8149b96998f04f713984005f28c64
Author: Eric Paris <eparis(a)redhat.com>
Date: Tue Dec 2 09:55:21 2014 -0500
Bump to upstream 993ef88eec9012b221f79abe8f2932ee97997d28
.gitignore | 1 +
getsource.sh | 9 ++++++---
kubernetes.spec | 11 +++++++----
sources | 2 +-
4 files changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46589e8..cf31e03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
/kubernetes-64e07f7.tar.gz
/kubernetes-ff1e9f4.tar.gz
/kubernetes-6aabd98.tar.gz
+/kubernetes-993ef88.tar.gz
diff --git a/getsource.sh b/getsource.sh
index 72ff28d..e3ee6cd 100755
--- a/getsource.sh
+++ b/getsource.sh
@@ -16,9 +16,12 @@ since_tag=0
if [[ "${KUBE_GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)\-([0-9]+)\-(.*)?$ ]]; then
git_major=${BASH_REMATCH[1]}
git_minor=${BASH_REMATCH[2]}
- if [[ -n "${BASH_REMATCH[3]}" ]]; then
- since_tag=${BASH_REMATCH[3]}
- fi
+ since_tag=${BASH_REMATCH[3]}
+# handle version like 0.4.2 (although we just ignore the .2 portion...)
+elif [[ "${KUBE_GIT_VERSION}" =~
^v([0-9]+)\.([0-9]+)\.([0-9]+)\-([0-9]+)\-(.*)?$ ]]; then
+ git_major=${BASH_REMATCH[1]}
+ git_minor=${BASH_REMATCH[2]}
+ since_tag=${BASH_REMATCH[4]}
fi
#put the git hash in as the commit
diff --git a/kubernetes.spec b/kubernetes.spec
index 21ee75a..39972d4 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -1,7 +1,7 @@
#debuginfo not supported with Go
%global debug_package %{nil}
%global import_path
github.com/GoogleCloudPlatform/kubernetes
-%global commit 6aabd9804fb75764b70e9172774002d4febcae34
+%global commit 993ef88eec9012b221f79abe8f2932ee97997d28
%global shortcommit %(c=%{commit}; echo ${c:0:7})
#I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -10,8 +10,8 @@
%global _checkshell /bin/bash
Name: kubernetes
-Version: 0.5
-Release: 235.0.git%{shortcommit}%{?dist}
+Version: 0.6
+Release: 4.0.git%{shortcommit}%{?dist}
Summary: Container cluster management
License: ASL 2.0
URL:
https://github.com/GoogleCloudPlatform/kubernetes
@@ -81,7 +81,7 @@ BuildRequires: golang(gopkg.in/v1/yaml)
%build
export KUBE_GIT_TREE_STATE="clean"
export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.5-235-g6aabd9804fb757
+export KUBE_GIT_VERSION=v0.6.0-4-g993ef88eec9012
%if 0%{?fedora}
export KUBE_GIT_TREE_STATE="dirty"
@@ -180,6 +180,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s
/sbin/nologin \
%systemd_postun
%changelog
+* Tue Dec 02 2014 Eric Paris <eparis(a)redhat.com> - 0.6-4.0.git993ef88
+- Bump to upstream 993ef88eec9012b221f79abe8f2932ee97997d28
+
* Mon Dec 01 2014 Eric Paris <eparis(a)redhat.com> - 0.5-235.0.git6aabd98
- Bump to upstream 6aabd9804fb75764b70e9172774002d4febcae34
diff --git a/sources b/sources
index 8cff684..da6d8b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96abb05fe028f4c528a99bdb6897c7a4 kubernetes-6aabd98.tar.gz
+c3e0eb40b413ddcff06b2f9e3754e4be kubernetes-993ef88.tar.gz