Hello community, here is the log from the commit of package containerd for openSUSE:Factory checked in at 2019-02-13 09:57:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/containerd (Old) and /work/SRC/openSUSE:Factory/.containerd.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "containerd" Wed Feb 13 09:57:49 2019 rev:29 rq:672796 version:1.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/containerd/containerd.changes 2019-01-21 10:07:10.718871787 +0100 +++ /work/SRC/openSUSE:Factory/.containerd.new.28833/containerd.changes 2019-02-13 09:58:03.297669593 +0100 @@ -1,0 +2,9 @@ +Tue Feb 5 11:16:46 UTC 2019 - Aleksa Sarai <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- 0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch containerd-git.468a545b9edc.tar.xz New: ---- containerd-git.9754871865f7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ containerd.spec ++++++ --- /var/tmp/diff_new_pack.1Itzeg/_old 2019-02-13 09:58:04.905669205 +0100 +++ /var/tmp/diff_new_pack.1Itzeg/_new 2019-02-13 09:58:04.905669205 +0100 @@ -34,17 +34,12 @@ %endif # MANUAL: Update the git_version. -%define containerd_version 1.1.2 -%define git_version 468a545b9edcd5932818eb9de8e72413e616e86e -%define git_short 468a545b9edc - -# 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 +%define containerd_version 1.2.2 +%define git_version 9754871865f7fe2f4e74d43e2fc7ccd237edcbce +%define git_short 9754871865f7 Name: %{realname}%{name_suffix} -Version: 1.1.2 +Version: 1.2.2 Release: 0 Summary: Standalone OCI Container Daemon License: Apache-2.0 @@ -52,10 +47,8 @@ Url: https://containerd.tools Source: %{realname}-git.%{git_short}.tar.xz Source1: %{realname}-rpmlintrc -# OPENSUSE-BACKPORT: Backport of https://github.com/containerd/containerd/pull/2534. -Patch1: 0001-docs-man-rename-config.toml-5-to-be-more-descriptive.patch # OPENSUSE-FIX-UPSTREAM: Backport of https://github.com/containerd/containerd/pull/2764. -Patch2: 0001-makefile-remove-emoji.patch +Patch1: 0001-makefile-remove-emoji.patch BuildRequires: fdupes BuildRequires: glibc-devel-static BuildRequires: go-go-md2man @@ -65,10 +58,9 @@ 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 @@ -139,7 +131,6 @@ %prep %setup -q -n %{realname}-git.%{git_short} %patch1 -p1 -%patch2 -p1 %build # Do not use symlinks. If you want to run the unit tests for this package at ++++++ _service ++++++ --- /var/tmp/diff_new_pack.1Itzeg/_old 2019-02-13 09:58:04.941669196 +0100 +++ /var/tmp/diff_new_pack.1Itzeg/_new 2019-02-13 09:58:04.941669196 +0100 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="filename">containerd</param> <param name="versionformat">git.%h</param> - <param name="revision">468a545b9edcd5932818eb9de8e72413e616e86e</param> + <param name="revision">v1.2.2</param> <param name="exclude">.git</param> </service> <service name="recompress" mode="disabled"> ++++++ containerd-git.468a545b9edc.tar.xz -> containerd-git.9754871865f7.tar.xz ++++++ ++++ 267233 lines of diff (skipped)
