jcapik pushed to kubernetes (f20). "Bump to upstream 52e165a4fd720d1703ebc31bd6660e01334227b8"

[notifications at fedoraproject.org]

From 5c2a4173b84d1c9e862be80558c6983a213b2ec9 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis at redhat.com>
Date: Tue, 16 Dec 2014 14:38:33 -0500
Subject: Bump to upstream 52e165a4fd720d1703ebc31bd6660e01334227b8


diff --git a/.gitignore b/.gitignore
index 8af60e2..def3adf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /kubernetes-6aabd98.tar.gz
 /kubernetes-993ef88.tar.gz
 /kubernetes-5ef34bf.tar.gz
+/kubernetes-52e165a.tar.gz
diff --git a/getsource.sh b/getsource.sh
index dd8d972..11f4dec 100755
--- a/getsource.sh
+++ b/getsource.sh
@@ -17,18 +17,22 @@ since_tag=0
 if [[ "${GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)\-([0-9]+)\-(.*)?$ ]]; then
   git_major=${BASH_REMATCH[1]}
   git_minor=${BASH_REMATCH[2]}
+  version="${git_major}.${git_minor}"
   since_tag=${BASH_REMATCH[3]}
 # handle version like 0.4.2 (although we just ignore the .2 portion...)
 elif [[ "${GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)\-([0-9]+)\-(.*)?$ ]]; then
   git_major=${BASH_REMATCH[1]}
   git_minor=${BASH_REMATCH[2]}
+  git_really_minor=${BASH_REMATCH[3]}
+  version="${git_major}.${git_minor}.${git_really_minor}"
   since_tag=${BASH_REMATCH[4]}
 fi
 
+
 #put the git hash in as the commit
 sed -i -e "s/%global commit\t\t[[:xdigit:]]\{40\}/%global commit\t\t${GIT_COMMIT}/" ${SPEC}
 #update the version with the latest tag
-sed -i -e "s/Version:\t[[:digit:]]\+\.[[:digit:]]\+\.\?[[:digit:]]\*/Version:\t${git_major}.${git_minor}/" ${SPEC}
+sed -i -e "s/Version:\t[[:digit:]]\+\.[[:digit:]]\+\(\.[[:digit:]]\+\)\?/Version:\t${version}/" ${SPEC}
 #update the release with since_tag
 sed -i -e "s/Release:\t[[:digit:]]\+\.[[:digit:]]\+/Release:\t${since_tag}.0/" ${SPEC}
 #update the git Version inside the built binaries
diff --git a/kubernetes.spec b/kubernetes.spec
index 5ad6b90..d3fe276 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		5ef34bf52311901b997119cc49eff944c610081b
+%global commit		52e165a4fd720d1703ebc31bd6660e01334227b8
 %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.6
-Release:	297.0.git%{shortcommit}%{?dist}
+Version:	0.7.0
+Release:	18.0.git%{shortcommit}%{?dist}
 Summary:	Container cluster management
 License:	ASL 2.0
 URL:		https://github.com/GoogleCloudPlatform/kubernetes
@@ -82,7 +82,7 @@ BuildRequires:	golang(gopkg.in/v2/yaml)
 %build
 export KUBE_GIT_TREE_STATE="clean"
 export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.6.0-297-g5ef34bf5231190
+export KUBE_GIT_VERSION=v0.7.0-18-g52e165a4fd720d
 
 %if 0%{?fedora}
 export KUBE_GIT_TREE_STATE="dirty"
@@ -181,6 +181,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Tue Dec 16 2014 Eric Paris <eparis at redhat.com> - 0.7.0-18.0.git52e165a
+- Bump to upstream 52e165a4fd720d1703ebc31bd6660e01334227b8
+
 * Mon Dec 15 2014 Eric Paris <eparis at redhat.com> - 0.6-297.0.git5ef34bf
 - Bump to upstream 5ef34bf52311901b997119cc49eff944c610081b
 
diff --git a/sources b/sources
index f31b5bd..7ff3bfd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-087f62a6f054d93aed013f3229095291  kubernetes-5ef34bf.tar.gz
+c52274fb797691d1c9532e9ac5f2658c  kubernetes-52e165a.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kubernetes.git/commit/?h=f20&id=5c2a4173b84d1c9e862be80558c6983a213b2ec9