[kubernetes/f21] Change docker.socket dependency to docker.service - resolves: #1190192

[Jan Chaloupka]

commit 541b5d52d753fe65d1b73d3e2e89c82f39f7b917
Author: Jan Chaloupka <jchaloup at redhat.com>
Date:   Fri Feb 6 18:03:13 2015 +0100

    Change docker.socket dependency to docker.service
    - resolves: #1190192

 ...ocker.socket-dependency-to-docker.service.patch |   27 ++++++++++++++++++++
 kubernetes.spec                                    |    8 +++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/Change-docker.socket-dependency-to-docker.service.patch b/Change-docker.socket-dependency-to-docker.service.patch
new file mode 100644
index 0000000..f01f587
--- /dev/null
+++ b/Change-docker.socket-dependency-to-docker.service.patch
@@ -0,0 +1,27 @@
+From f6feca113c856583968bc4f463d026b8296046bd Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Fri, 6 Feb 2015 18:01:06 +0100
+Subject: [PATCH] Change docker.socket dependency to docker.service
+
+---
+ contrib/init/systemd/kubelet.service | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/init/systemd/kubelet.service b/contrib/init/systemd/kubelet.service
+index 52b5b85..6990f29 100644
+--- a/contrib/init/systemd/kubelet.service
++++ b/contrib/init/systemd/kubelet.service
+@@ -1,8 +1,8 @@
+ [Unit]
+ Description=Kubernetes Kubelet Server
+ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
+-After=docker.socket cadvisor.service
+-Requires=docker.socket
++After=docker.service cadvisor.service
++Requires=docker.service
+ 
+ [Service]
+ EnvironmentFile=-/etc/kubernetes/config
+-- 
+1.9.3
+
diff --git a/kubernetes.spec b/kubernetes.spec
index 7781e1e..ff9230d 100644
--- a/kubernetes.spec
+++ b/kubernetes.spec
@@ -15,13 +15,14 @@
 
 Name:		kubernetes
 Version:	0.9.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
 ExclusiveArch:	x86_64
 Source0:	https://github.com/GoogleCloudPlatform/kubernetes/archive/%{commit}/kubernetes-%{shortcommit}.tar.gz
 
+
 %if 0%{?fedora} >= 21 || 0%{?rhel}
 Requires:	docker
 %else
@@ -38,6 +39,7 @@ BuildRequires:	systemd
 BuildRequires:	etcd
 BuildRequires:	hostname
 
+Patch0: Change-docker.socket-dependency-to-docker.service.patch
 %if 0%{?fedora}
 Patch1: rename-import-paths.patch
 Patch2: update-tests-to-etcd-2.0.patch
@@ -409,6 +411,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
 %systemd_postun
 
 %changelog
+* Fri Feb 06 2015 jchaloup <jchaloup at redhat.com> - 0.9.1-0.2.git3623a01
+- Change docker.socket dependency to docker.service
+  resolves: #1190192
+
 * Tue Jan 27 2015 jchaloup <jchaloup at redhat.com> - 0.9.1-0.1.git3623a01
 - Bump to upstream 3623a01bf0e90de6345147eef62894057fe04b29
 - update tests for etcd-2.0