From 9e2abca55b8bae520b335b5a5485f25774ca54e4 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 17 Feb 2025 11:08:28 +0100 Subject: [PATCH] containers-common-1-115.el9 - Add containers-common-extra properly - Resolves: RHEL-78845 Signed-off-by: Jindrich Novy --- containers-common.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/containers-common.spec b/containers-common.spec index 71a0823..e95220b 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -12,13 +12,12 @@ Epoch: 2 Name: containers-common Version: 1 -Release: 114%{?dist} +Release: 115%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 ExclusiveArch: %{go_arches} BuildRequires: /usr/bin/go-md2man Provides: skopeo-containers = %{epoch}:%{version}-%{release} -Provides: containers-common-extra = %{epoch}:%{version}-%{release} Conflicts: %{name} <= 2:1-22 Obsoletes: %{name} <= 2:1-22 Requires: (container-selinux >= 2:2.162.1 if selinux-policy) @@ -77,6 +76,18 @@ It is required because the most of configuration files and docs come from projec which are vendored into Podman, Buildah, Skopeo, etc. but they are not packaged separately. +%package extra +Summary: Extra dependencies for Podman and Buildah +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: container-network-stack +Requires: oci-runtime +Requires: nftables +Requires: passt + +%description extra +This subpackage will handle dependencies common to Podman and Buildah which are +not required by Skopeo. + %prep %build @@ -178,6 +189,10 @@ EOF %{_datadir}/rhel/secrets/* %changelog +* Mon Feb 17 2025 Jindrich Novy - 2:1-115 +- Add containers-common-extra properly +- Resolves: RHEL-78845 + * Thu Feb 13 2025 Jindrich Novy - 2:1-114 - update vendored components - Related: RHEL-60277