Accepting request 672744 from home:cyphar:containers:docker_18.09.1

- Remove required_dockerrunc commit pinning, as it just lead to issues.

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

containerd.changes

@@ -3,6 +3,7 @@ Tue Feb  5 11:16:46 UTC 2019 - Aleksa Sarai <asarai@suse.com>
 
 - Update to containerd v1.2.2, which is required for Docker v18.09.1-ce.
   bsc#1124308
+- 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

@@ -38,11 +38,6 @@
 %define git_version 9754871865f7fe2f4e74d43e2fc7ccd237edcbce
 %define git_short   9754871865f7
 
-# These are the git commits required. We verify them against the source to make
-# sure we didn't miss anything important when doing upgrades. This MUST match
-# required_dockerrunc in docker.spec!
-%define required_dockerrunc 69663f0bd4b60df09991c08812a60108003fa340
-
 Name:           %{realname}%{name_suffix}
 Version:        1.2.2
 Release:        0
@@ -63,10 +58,9 @@ BuildRequires:  pkg-config
 BuildRequires:  golang(API) = 1.10
 # 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 match the
-# same version as the one pinned by Docker. Obviously we pin the same flavour
-# as us, to avoid mixing.
-Requires:       docker-runc%{name_suffix}-git = %{required_dockerrunc}
+# Currently runc is the only supported runtime for containerd. We pin the same
+# flavour as us, to avoid mixing (the version pinning is done by docker.spec).
+Requires:       docker-runc%{name_suffix}
 Requires(post): %fillup_prereq
 ExcludeArch:    s390
 # KUBIC-SPECIFIC: This was required when upgrading from the original kubic