[kubernetes/f22] Bump to upstream 0fec31a11edff14715a1efb27f77262a7c3770f4

Jan Chaloupka jchaloup at fedoraproject.org
Mon Mar 2 12:02:31 UTC 2015


commit 21b3e160b333914ac013084af29b8984dd8f678e
Author: Jan Chaloupka <jchaloup at redhat.com>
Date:   Sat Feb 28 14:23:24 2015 +0100

    Bump to upstream 0fec31a11edff14715a1efb27f77262a7c3770f4

 .gitignore      |  2 +-
 kubernetes.spec | 13 ++++++++-----
 sources         |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 26812b8..9eb976e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kubernetes-08402d7.tar.gz
+/kubernetes-0fec31a.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 6078118..2e4edb5 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -5,7 +5,7 @@
 %global project		GoogleCloudPlatform
 %global repo		kubernetes
 %global import_path	%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit		08402d798c8f207a2e093de5a670c5e8e673e2de
+%global commit		0fec31a11edff14715a1efb27f77262a7c3770f4
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
 
 #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -15,7 +15,7 @@
 
 Name:		kubernetes
 Version:	0.11.0
-Release:	0.3.git%{shortcommit}%{?dist}
+Release:	0.4.git%{shortcommit}%{?dist}
 Summary:	Container cluster management
 License:	ASL 2.0
 URL:		https://github.com/GoogleCloudPlatform/kubernetes
@@ -32,11 +32,11 @@ Requires:	etcd
 
 Requires(pre):	shadow-utils
 
-BuildRequires:	git
 BuildRequires:	golang >= 1.2-7
 BuildRequires:	systemd
 BuildRequires:	etcd
 BuildRequires:	hostname
+BuildRequires:  rsync
 
 %if 0%{?fedora} 
 # needed for go cover.  Not available in RHEL/CentOS (available in Fedora/EPEL)
@@ -306,12 +306,12 @@ building other packages which use %{project}/%{repo}.
 %endif
 
 %prep
-%autosetup -Sgit -n %{name}-%{commit}
+%autosetup -n %{name}-%{commit}
 
 %build
 export KUBE_GIT_TREE_STATE="clean"
 export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.11.0-363-g86434b4038ab87
+export KUBE_GIT_VERSION=v0.11.0-500-g0fec31a11edff1
 
 %if 0%{?fedora}
 #export KUBE_GIT_TREE_STATE="dirty"
@@ -425,6 +425,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Sat Feb 28 2015 jchaloup <jchaloup at redhat.com> - 0.11.0-0.4.git0fec31a
+- Bump to upstream 0fec31a11edff14715a1efb27f77262a7c3770f4
+
 * Fri Feb 27 2015 jchaloup <jchaloup at redhat.com> - 0.11.0-0.3.git08402d7
 - Bump to upstream 08402d798c8f207a2e093de5a670c5e8e673e2de
 
diff --git a/sources b/sources
index df98a6e..068d4d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7bc91d35116a869e45a9403ec270eed8  kubernetes-08402d7.tar.gz
+39c9d57dc447c8f003495d44970807e9  kubernetes-0fec31a.tar.gz


More information about the scm-commits mailing list