From 6fc641897a8e32282537131428175c1b3fe60a41e5b69a0195624d4525065c0a Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Mon, 19 Dec 2016 14:01:27 +0000
Subject: [PATCH] Accepting request 447027 from
 home:jordimassaguerpla:branch:V:c:update_docker_to_1_12_5

OBS-URL: https://build.opensuse.org/request/show/447027
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=40
---
 _service                      | 2 +-
 containerd-git.0366d7e.tar.xz | 3 ---
 containerd-git.2a5e70c.tar.xz | 3 +++
 containerd.changes            | 6 ++++++
 containerd.spec               | 8 ++++----
 5 files changed, 14 insertions(+), 8 deletions(-)
 delete mode 100644 containerd-git.0366d7e.tar.xz
 create mode 100644 containerd-git.2a5e70c.tar.xz

diff --git a/_service b/_service
index dc7ed6a..2c406ab 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="filename">containerd</param>
     <param name="versionformat">git.%h</param>
-    <param name="revision">0366d7e9693c930cf18c0f50cc16acec064e96c5</param>
+    <param name="revision">2a5e70cbf65457815ee76b7e5dd2a01292d9eca8</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/containerd-git.0366d7e.tar.xz b/containerd-git.0366d7e.tar.xz
deleted file mode 100644
index d09cd30..0000000
--- a/containerd-git.0366d7e.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc2669ba658a07d4280fe330e46e82af92db31ca55c24228a0b2f303549f3a04
-size 476264
diff --git a/containerd-git.2a5e70c.tar.xz b/containerd-git.2a5e70c.tar.xz
new file mode 100644
index 0000000..b73af48
--- /dev/null
+++ b/containerd-git.2a5e70c.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f15e307be487785e238a94fd99304364259a5099b7a49f6fada70f33c993bd06
+size 481888
diff --git a/containerd.changes b/containerd.changes
index 05fd3e4..cb21469 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec 19 12:46:14 UTC 2016 - jmassaguerpla@suse.com
+
+- update containerd to the version used in docker 1.12.5 (bsc#1016307).
+  This fixes bsc#1015661 
+
 -------------------------------------------------------------------
 Thu Nov 24 16:10:41 UTC 2016 - jmassaguerpla@suse.com
 
diff --git a/containerd.spec b/containerd.spec
index f338339..b32c2b4 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -39,17 +39,17 @@
 %endif
 
 # MANUAL: Update the git_version and git_revision
-%define git_version 0366d7e
+%define git_version 2a5e70c
 # How to get the git_revision
 # git clone https://github.com/docker/containerd.git containerd-upstream
 # cd containerd
 # git checkout $git_version
 # git_revision=r$(git rev-list HEAD | wc -l)
-%define git_revision r565
+%define git_revision r569
 %define version_unconverted %{git_version}
 
 Name:           containerd
-Version:        0.2.4+git%{git_revision}_%{git_version}
+Version:        0.2.5+git%{git_revision}_%{git_version}
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0
@@ -70,7 +70,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Dockerfile.  However, for some reason the Dockerfile for containerd
 # diverges from the one for Docker. As such, this cannot be a hard
 # requirement (that would break Docker).
-Requires:       runc = 0.1.1+gitr2816_02f8fa7
+Requires:       runc = 0.1.1+gitr2818_f59ba3cdd76f
 Requires(post): %fillup_prereq
 
 %define client ctr