jcapik pushed to kubernetes (f22). "Bump to upstream d136728df7e2694df9e082902f6239c11b0f2b00 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Jun 10 15:07:56 UTC 2015


From 78c113ca01de27a1d59bee36b7e9431eeabdeb77 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup at redhat.com>
Date: Fri, 8 May 2015 21:10:50 +0200
Subject: Bump to upstream d136728df7e2694df9e082902f6239c11b0f2b00 Add
 NetworkManager as dependency for /etc/resolv.conf - related: #1211266


diff --git a/.gitignore b/.gitignore
index 4f858f0..ea416ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kubernetes-ca0f678.tar.gz
+/kubernetes-d136728.tar.gz
diff --git a/kubernetes.spec b/kubernetes.spec
index 59d23af..4624f21 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -6,7 +6,7 @@
 %global repo		kubernetes
 # https://github.com/GoogleCloudPlatform/kubernetes
 %global import_path	%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit		ca0f678b9a0a6dc795ac7a595350d0dbe9d0ac3b
+%global commit		d136728df7e2694df9e082902f6239c11b0f2b00
 %global shortcommit	%(c=%{commit}; echo ${c:0:7})
 
 #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)"
@@ -16,7 +16,7 @@
 
 Name:		kubernetes
 Version:	0.16.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:        Container cluster management
 License:        ASL 2.0
 URL:            %{import_path}
@@ -39,6 +39,7 @@ BuildRequires:	systemd
 BuildRequires:	etcd >= 2.0.8
 BuildRequires:	hostname
 BuildRequires:	rsync
+BuildRequires:  NetworkManager
 
 %if 0%{?fedora}
 # needed for go cover.  Not available in RHEL/CentOS (available in Fedora/EPEL)
@@ -262,6 +263,7 @@ Requires: golang >= 1.2-7
 Requires: etcd >= 2.0.9
 Requires: hostname
 Requires: rsync
+Requires: NetworkManager
 
 %description unit-test
 %{summary} - for running unit tests
@@ -272,7 +274,7 @@ Requires: rsync
 %build
 export KUBE_GIT_TREE_STATE="clean"
 export KUBE_GIT_COMMIT=%{commit}
-export KUBE_GIT_VERSION=v0.16.2-536-gca0f678b9a0a6d
+export KUBE_GIT_VERSION=v0.16.2-619-ga453d0b1871b59
 
 %if 0%{?fedora}
 #export KUBE_GIT_TREE_STATE="dirty"
@@ -403,6 +405,11 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Fri May 08 2015 jchaloup <jchaloup at redhat.com> - 0.16.2-6
+- Bump to upstream d136728df7e2694df9e082902f6239c11b0f2b00
+- Add NetworkManager as dependency for /etc/resolv.conf
+  related: #1211266
+
 * Thu May 07 2015 jchaloup <jchaloup at redhat.com> - 0.16.2-5
 - Bump to upstream ca0f678b9a0a6dc795ac7a595350d0dbe9d0ac3b
   related: #1211266
diff --git a/sources b/sources
index 23ec3ec..553748a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0fc721b604724cd16ebcf11777495b18  kubernetes-ca0f678.tar.gz
+0c293596cd6689c63153150d4fac9173  kubernetes-d136728.tar.gz
-- 
cgit v0.10.2


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


More information about the scm-commits mailing list