Accepting request 700421 from home:cyphar:docker_18.09.5

- Update to Docker 18.09.5-ce see upstream changelog in the packaged
/usr/share/doc/packages/docker/CHANGELOG.md. bsc#1128376 boo#1134068

OBS-URL: https://build.opensuse.org/request/show/700421
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=93

_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">git.%h</param>
-    <param name="revision">v1.2.4</param>
+    <param name="versionformat">1.2.5_%h</param>
+    <param name="revision">v1.2.5</param>
     <param name="exclude">.git</param>
   </service>
   <service name="recompress" mode="disabled">

containerd-1.2.5_bb71b10fd8f5.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:742ec46513c2fd23291fd98e06ba455b5030e6e23818dd65a5ea28a35deb89f5
+size 2670216

containerd-git.e6b3f5632f50.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6aa1e606f2844d33c806eb7128d0ced462fb1263e64cebec3f6f07f2a111d3f3
-size 2721860

containerd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May  3 13:32:05 UTC 2019 - Aleksa Sarai <asarai@suse.com>
+
+- Update to containerd v1.2.5, which is required for v18.09.5-ce.
+  bsc#1128376 boo#1134068
+  https://github.com/containerd/containerd/releases/tag/v1.2.5
+
 -------------------------------------------------------------------
 Thu Mar 21 14:30:03 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
 
@@ -28,7 +35,6 @@ Tue Feb  5 11:16:46 UTC 2019 - Aleksa Sarai <asarai@suse.com>
     https://github.com/containerd/containerd/releases/tag/v1.2.0
     https://github.com/containerd/containerd/releases/tag/v1.1.4
     https://github.com/containerd/containerd/releases/tag/v1.1.3
-  
 - Remove required_dockerrunc commit pinning, as it just lead to issues.
 - Remove upstreamed patches.
   - 0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch

containerd.spec

@@ -34,18 +34,17 @@
 %endif
 
 # MANUAL: Update the git_version.
-%define containerd_version 1.2.4
-%define git_version e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e
-%define git_short   e6b3f5632f50
+%define git_version bb71b10fd8f58240ca47fbb579b9d1028eea7c84
+%define git_short   bb71b10fd8f5
 
 Name:           %{realname}%{name_suffix}
-Version:        %{containerd_version}
+Version:        1.2.5
 Release:        0
 Summary:        Standalone OCI Container Daemon
 License:        Apache-2.0
 Group:          System/Management
 Url:            https://containerd.tools
-Source:         %{realname}-git.%{git_short}.tar.xz
+Source:         %{realname}-%{version}_%{git_short}.tar.xz
 Source1:        %{realname}-rpmlintrc
 # OPENSUSE-FIX-UPSTREAM: Backport of https://github.com/containerd/containerd/pull/2764.
 Patch1:         0001-makefile-remove-emoji.patch
@@ -55,7 +54,7 @@ BuildRequires:  go-go-md2man
 BuildRequires:  libbtrfs-devel >= 3.8
 BuildRequires:  libseccomp-devel >= 2.2
 BuildRequires:  pkg-config
-BuildRequires:  golang(API) = 1.10
+BuildRequires:  golang(API) >= 1.11
 # We provide a git revision so that Docker can require it properly.
 Provides:       %{name}-git = %{git_version}
 # Currently runc is the only supported runtime for containerd. We pin the same
@@ -91,7 +90,6 @@ migration of containers.
 Summary:        Client for %{name}
 Group:          System/Management
 Requires:       %{name} = %{version}
-BuildRequires:  golang(API) = 1.10
 # 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
@@ -111,7 +109,6 @@ separately from Docker.
 %package test
 Summary:        Test package for containerd
 Group:          System/Management
-BuildRequires:  golang(API) = 1.10
 BuildArch:      noarch
 # KUBIC-SPECIFIC: This was required when upgrading from the original kubic
 #                 packaging, when everything was renamed to -kubic. It also is
@@ -129,7 +126,7 @@ Provides:       %{realname}-test = %{version}
 Test package for containerd. It contains the source code and the tests.
 
 %prep
-%setup -q -n %{realname}-git.%{git_short}
+%setup -q -n %{realname}-%{version}_%{git_short}
 %patch1 -p1
 
 %build