From a6851c5d1779c41e99c6445b213588b08ba138d7 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Dec 12 2016 14:15:23 +0000 Subject: Bump to upstream v1.4.7 - resolves: #1403823 --- diff --git a/.gitignore b/.gitignore index a884dc0..b4cf3dd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /origin-67479ff.tar.gz /kubernetes-d19513f.tar.gz /kubernetes-5a0a696.tar.gz +/kubernetes-92b4f97.tar.gz diff --git a/kubernetes.spec b/kubernetes.spec index 82e0b1e..cc5e809 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -21,7 +21,7 @@ # https://github.com/kubernetes/kubernetes %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path k8s.io/kubernetes -%global commit 5a0a696437ad35c133c0c8493f7e9d22b0f9b81b +%global commit 92b4f971662de9d8770f8dcd2ee01ec226a6f6c0 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global con_provider github @@ -33,7 +33,7 @@ %global con_commit 17c9a8df1be43378b0026dc22f6000a3e9952a18 %global con_shortcommit %(c=%{con_commit}; echo ${c:0:7}) -%global kube_version 1.4.5 +%global kube_version 1.4.7 %global kube_git_version v%{kube_version} #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)" @@ -43,7 +43,7 @@ Name: kubernetes Version: %{kube_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -1099,6 +1099,10 @@ fi %systemd_postun %changelog +* Mon Dec 12 2016 Jan Chaloupka - 1.4.7-1 +- Bump to upstream v1.4.7 + resolves: #1403823 + * Mon Nov 14 2016 jchaloup - 1.4.5-3 - Patch unit-test subpackage to run tests over k8s distro binaries diff --git a/sources b/sources index 0bd1727..367d5fa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bc0da49b010c7ac26b75e3606ef259dc contrib-17c9a8d.tar.gz -fd2007a83bd69e7faecdbf82e7093d7d kubernetes-5a0a696.tar.gz +SHA512 (contrib-17c9a8d.tar.gz) = a35f13c6739194e860acf60d9455bea2aec855b86993df35dd9b5946acb5e99b3551d71c9b25335e02bfbd3e6ea7c0c1baba9add517e6168a7f98a0e4fc52894 +SHA512 (kubernetes-92b4f97.tar.gz) = 66b671216c64c78a749d9a0cb3d90cc3e2938c42dc181e7a2a2b67361b19e2b519006070f9708889934b0f390886f986d2b4c08491b4ac34d2a2c0107923f0db