jchaloup pushed to kubernetes (f22). "Bump to upstream a94ffc8625beb5e2a39edb01edc839cb8e59c444"

[notifications at fedoraproject.org]

>From 8c9c316fba95e814add2ecdb27e6feecd92d977b Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Thu, 2 Apr 2015 12:51:12 +0200
Subject: Bump to upstream a94ffc8625beb5e2a39edb01edc839cb8e59c444


diff --git a/.gitignore b/.gitignore
index d92e97e..e92384c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kubernetes-8168344.tar.gz
+/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 9200f81..afa5cf7 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 d0ebdcd6bcee9e7e2d6407003ce276f21fcad0e2 Mon Sep 17 00:00:00 2001
+From b3c9f9e91378e1f09cc9cb867e24c13677571cf8 Mon Sep 17 00:00:00 2001
 From: Jan Chaloupka <jchaloup at redhat.com>
-Date: Wed, 1 Apr 2015 10:31:55 +0200
-Subject: [PATCH] No Nicer error msg if stdlib pkg with cgo flag is not
+Date: Thu, 2 Apr 2015 12:38:02 +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 3683ef2..49a9ceb 100644
+index 111a6a0..d315634 100644
 --- a/hack/lib/golang.sh
 +++ b/hack/lib/golang.sh
-@@ -331,7 +331,6 @@ kube::golang::build_binaries() {
-           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}" \
-@@ -346,7 +345,6 @@ kube::golang::build_binaries() {
-       else
+@@ -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;
-             CGO_ENABLED=0 go install -installsuffix cgo "${goflags[@]:+${goflags[@]}}" \
-               -ldflags "${version_ldflags}" \
-               "${binary}"
+             statics+=($binary)
+           else
+             nonstatics+=($binary)
+@@ -345,7 +344,6 @@ kube::golang::build_binaries() {
+             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}" \
 -- 
 1.9.3
 
diff --git a/kubernetes.spec b/kubernetes.spec
index 88f3d75..a203e5a 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		81683441b96537d4b51d146e39929b7003401cd5
+%global commit		a94ffc8625beb5e2a39edb01edc839cb8e59c444
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
 
 #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -14,8 +14,8 @@
 %global _checkshell	/bin/bash
 
 Name:		kubernetes
-Version:	0.14.0
-Release:	0.2.git%{shortcommit}%{?dist}
+Version:	0.14.1
+Release:	0.1.git%{shortcommit}%{?dist}
 Summary:	Container cluster management
 License:	ASL 2.0
 URL:		https://github.com/GoogleCloudPlatform/kubernetes
@@ -224,7 +224,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.0-130-g81683441b96537
+export KUBE_GIT_VERSION=v0.14.1-221-ga94ffc8625beb5
 
 %if 0%{?fedora}
 #export KUBE_GIT_TREE_STATE="dirty"
@@ -343,6 +343,9 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Thu Apr 02 2015 jchaloup <jchaloup at redhat.com> - 0.14.1-0.1.gita94ffc8
+- Bump to upstream a94ffc8625beb5e2a39edb01edc839cb8e59c444
+
 * Wed Apr 01 2015 jchaloup <jchaloup at redhat.com> - 0.14.0-0.2.git8168344
 - Bump to upstream 81683441b96537d4b51d146e39929b7003401cd5
 
diff --git a/sources b/sources
index a65e2ae..e6b6bd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-70fcc20b2a5ba77dbf11717c619d2695  kubernetes-8168344.tar.gz
+51162be366e52674a2c3b8a5fccae1a3  kubernetes-a94ffc8.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kubernetes.git/commit/?h=f22&id=8c9c316fba95e814add2ecdb27e6feecd92d977b