From 5412f6f129399e04bb45ec08ad050fbe9a72f17f7420210a2ea2795d29d8b6e7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 25 Jun 2024 15:35:36 +0000 Subject: [PATCH] gate noarch subpackage via check for sles && sync changelog with sles 12 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/containerd?expand=0&rev=180 --- containerd.changes | 14 +++++++++++++- containerd.spec | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/containerd.changes b/containerd.changes index 44c2999..6dd799f 100644 --- a/containerd.changes +++ b/containerd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 24 10:12:35 UTC 2024 - Dan Čermák + +- Revert noarch for devel subpackage for SLE 15 + + Switching to noarch causes issues on SLES maintenance updates, reverting it + fixes our image builds + ------------------------------------------------------------------- Wed May 22 19:31:04 UTC 2024 - Aleksa Sarai @@ -67,7 +75,11 @@ Mon Dec 4 08:44:40 UTC 2023 - Aleksa Sarai Fri Oct 27 21:13:23 UTC 2023 - Aleksa Sarai - Update to containerd v1.7.8. Upstream release notes: - bsc#1200528 + + + Includes fixes for: + - CVE-2022-1996 bsc#1200528 + - Rebase patches: * 0001-BUILD-SLE12-revert-btrfs-depend-on-kernel-UAPI-inste.patch diff --git a/containerd.spec b/containerd.spec index acb8ee5..cdf204f 100644 --- a/containerd.spec +++ b/containerd.spec @@ -89,7 +89,10 @@ separately from Docker. Summary: Source code for containerd Group: Development/Libraries/Go Requires: %{name} = %{version} +# cannot switch to noarch on SLE as that breaks maintenance updates +%if 0%{?suse_version} > 1500 BuildArch: noarch +%endif %description devel This package contains the source code needed for building packages that