jchaloup pushed to kubernetes (f21). "Bump to upstream d2f473465738e6b6f7935aa704319577f5e890ba"

[notifications at fedoraproject.org]

>From d1ced64c3686e652c085e9ee6d1fa30268a26cc2 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Tue, 7 Apr 2015 15:37:26 +0200
Subject: Bump to upstream d2f473465738e6b6f7935aa704319577f5e890ba


diff --git a/.gitignore b/.gitignore
index 8634592..02d989b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 clog
 *.tar.gz
 *.src.rpm
-/kubernetes-a94ffc8.tar.gz
diff --git a/0001-No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch b/0001-No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch
index afa5cf7..8f91c3a 100644
--- a/0001-No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch
+++ b/0001-No-Nicer-error-msg-if-stdlib-pkg-with-cgo-flag-is-no.patch
@@ -1,7 +1,7 @@
-From b3c9f9e91378e1f09cc9cb867e24c13677571cf8 Mon Sep 17 00:00:00 2001
+From 9e1cf168d92f155e478cd56c3b78ac4dee155237 Mon Sep 17 00:00:00 2001
 From: Jan Chaloupka <jchaloup at redhat.com>
-Date: Thu, 2 Apr 2015 12:38:02 +0200
-Subject: [PATCH] No Nicer error msg if stdlib pkg with cgo flag is not 
+Date: Tue, 7 Apr 2015 16:06:19 +0200
+Subject: [PATCH] No Nicer error msg if stdlib pkg with cgo flag is not
  installed
 
 ---
@@ -9,25 +9,25 @@ Subject: [PATCH] No Nicer error msg if stdlib pkg with cgo flag is not
  1 file changed, 2 deletions(-)
 
 diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
-index 111a6a0..d315634 100644
+index 5dc923f..588992b 100644
 --- a/hack/lib/golang.sh
 +++ b/hack/lib/golang.sh
-@@ -323,7 +323,6 @@ kube::golang::build_binaries() {
-         local -a nonstatics=()
-         for binary in "${binaries[@]}"; do
-           if kube::golang::is_statically_linked_library "${binary}"; then
--            kube::golang::exit_if_stdlib_not_installed;
-             statics+=($binary)
-           else
-             nonstatics+=($binary)
-@@ -345,7 +344,6 @@ kube::golang::build_binaries() {
-             fi
+@@ -276,7 +276,6 @@ kube::golang::build_binaries_for_platform() {
+   local -a nonstatics=()
+   for binary in "${binaries[@]}"; do
+     if kube::golang::is_statically_linked_library "${binary}"; then
+-      kube::golang::exit_if_stdlib_not_installed;
+       statics+=($binary)
+     else
+       nonstatics+=($binary)
+@@ -298,7 +297,6 @@ kube::golang::build_binaries_for_platform() {
+       fi
  
-             if kube::golang::is_statically_linked_library "${binary}"; then
--              kube::golang::exit_if_stdlib_not_installed;
-               CGO_ENABLED=0 go build -installsuffix cgo -o "${output_path}/${bin}" \
-                 "${goflags[@]:+${goflags[@]}}" \
-                 -ldflags "${version_ldflags}" \
+       if kube::golang::is_statically_linked_library "${binary}"; then
+-        kube::golang::exit_if_stdlib_not_installed;
+         CGO_ENABLED=0 go build -installsuffix cgo -o "${output_path}/${bin}" \
+           "${goflags[@]:+${goflags[@]}}" \
+           -ldflags "${version_ldflags}" \
 -- 
 1.9.3
 
diff --git a/kubernetes.spec b/kubernetes.spec
index 7cb6fb0..60a1a2b 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		a94ffc8625beb5e2a39edb01edc839cb8e59c444
+%global commit		d2f473465738e6b6f7935aa704319577f5e890ba
 %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.14.1
-Release:	0.1.git%{shortcommit}%{?dist}
+Release:	0.2.git%{shortcommit}%{?dist}
 Summary:	Container cluster management
 License:	ASL 2.0
 URL:		https://github.com/GoogleCloudPlatform/kubernetes
@@ -225,7 +225,7 @@ building other packages which use %{project}/%{repo}.
 %build
 export KUBE_GIT_TREE_STATE="clean"
 export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.14.1-221-ga94ffc8625beb5
+export KUBE_GIT_VERSION=v0.14.1-460-gd2f473465738e6
 
 %if 0%{?fedora}
 #export KUBE_GIT_TREE_STATE="dirty"
@@ -344,6 +344,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Tue Apr 07 2015 jchaloup <jchaloup at redhat.com> - 0.14.1-0.2.gitd2f4734
+- Bump to upstream d2f473465738e6b6f7935aa704319577f5e890ba
+
 * Thu Apr 02 2015 jchaloup <jchaloup at redhat.com> - 0.14.1-0.1.gita94ffc8
 - Bump to upstream a94ffc8625beb5e2a39edb01edc839cb8e59c444
 
diff --git a/sources b/sources
index e6b6bd3..8af4d52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51162be366e52674a2c3b8a5fccae1a3  kubernetes-a94ffc8.tar.gz
+0d8c40955cee0678961171d19f14bad8  kubernetes-d2f4734.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kubernetes.git/commit/?h=f21&id=d1ced64c3686e652c085e9ee6d1fa30268a26cc2