From cc9416af595afd00b34ffe5b0ba2894d18586dc39eb8adfdc524312f8475ad92 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.com>
Date: Fri, 28 Jun 2019 01:58:22 +0000
Subject: [PATCH] Accepting request 712296 from home:cyphar:docker

Docker v18.09.7.

OBS-URL: https://build.opensuse.org/request/show/712296
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=95
---
 _service                             |  4 ++--
 containerd-1.2.5_bb71b10fd8f5.tar.xz |  3 ---
 containerd-1.2.6_894b81a4b802.tar.xz |  3 +++
 containerd.changes                   |  7 ++++++
 containerd.spec                      | 35 +++-------------------------
 5 files changed, 15 insertions(+), 37 deletions(-)
 delete mode 100644 containerd-1.2.5_bb71b10fd8f5.tar.xz
 create mode 100644 containerd-1.2.6_894b81a4b802.tar.xz

diff --git a/_service b/_service
index a353cff..35f9270 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">https://github.com/containerd/containerd.git</param>
     <param name="scm">git</param>
     <param name="filename">containerd</param>
-    <param name="versionformat">1.2.5_%h</param>
-    <param name="revision">v1.2.5</param>
+    <param name="versionformat">1.2.6_%h</param>
+    <param name="revision">v1.2.6</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/containerd-1.2.5_bb71b10fd8f5.tar.xz b/containerd-1.2.5_bb71b10fd8f5.tar.xz
deleted file mode 100644
index 776eb6b..0000000
--- a/containerd-1.2.5_bb71b10fd8f5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:742ec46513c2fd23291fd98e06ba455b5030e6e23818dd65a5ea28a35deb89f5
-size 2670216
diff --git a/containerd-1.2.6_894b81a4b802.tar.xz b/containerd-1.2.6_894b81a4b802.tar.xz
new file mode 100644
index 0000000..3c1b073
--- /dev/null
+++ b/containerd-1.2.6_894b81a4b802.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17c6988fdbc49a49c328880e0d6895349ef1eb72709fa1392c86019b42d3d0c1
+size 2671744
diff --git a/containerd.changes b/containerd.changes
index 6c5d8fb..6683ff5 100644
--- a/containerd.changes
+++ b/containerd.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun 28 01:45:50 UTC 2019 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.2.6, which is required for Docker v18.09.7-ce.
+  bsc#1139649
+- Remove containerd-test (it's not useful for actual testing).
+
 -------------------------------------------------------------------
 Fri May  3 13:32:05 UTC 2019 - Aleksa Sarai <asarai@suse.com>
 
diff --git a/containerd.spec b/containerd.spec
index 129a08c..8c0b654 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -34,11 +34,11 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define git_version bb71b10fd8f58240ca47fbb579b9d1028eea7c84
-%define git_short   bb71b10fd8f5
+%define git_version 894b81a4b802e4eb2a91d1ce216b8817763c29fb
+%define git_short   894b81a4b802
 
 Name:           %{realname}%{name_suffix}
-Version:        1.2.5
+Version:        1.2.6
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0
@@ -106,25 +106,6 @@ Provides:       %{realname}-ctr = %{version}
 Standalone client for containerd, which allows management of containerd containers
 separately from Docker.
 
-%package test
-Summary:        Test package for containerd
-Group:          System/Management
-BuildArch:      noarch
-# KUBIC-SPECIFIC: This was required when upgrading from the original kubic
-#                 packaging, when everything was renamed to -kubic. It also is
-#                 used to ensure that nothing complains too much when using
-#                 -kubic packages. Hopfully it can be removed one day.
-%if "%flavour" == "kubic"
-# Obsolete older package without -kubic suffix: v2 -> v3
-Obsoletes:      %{realname}-test = 0.2.5+gitr569_2a5e70c
-# Conflict with non-kubic package, and provide equivalent
-Conflicts:      %{realname}-test > 0.2.5+gitr569_2a5e70c
-Provides:       %{realname}-test = %{version}
-%endif
-
-%description test
-Test package for containerd. It contains the source code and the tests.
-
 %prep
 %setup -q -n %{realname}-%{version}_%{git_short}
 %patch1 -p1
@@ -181,12 +162,6 @@ do
 done
 ln -s ctr.1 %{buildroot}/%{_mandir}/man1/%{realname}-ctr.1
 
-# Source tree for containerd-test.
-install -d -m755 %{buildroot}/usr/src/containerd/
-cp -ar $HOME/go/src/github.com/containerd/containerd/* %{buildroot}/usr/src/containerd/
-# Remove files we don't want to ship - exclude is the wrong usage here.
-rm -rf %{buildroot}/usr/src/containerd/bin
-
 %fdupes %{buildroot}
 
 %files
@@ -206,8 +181,4 @@ rm -rf %{buildroot}/usr/src/containerd/bin
 %{_sbindir}/%{realname}-ctr
 %{_mandir}/man1/*ctr.1*
 
-%files test
-%defattr(-,root,root)
-/usr/src/containerd/
-
 %changelog