Drop ineffective Obsoletes for containernetworking-plugins

The Obsoletes: containernetworking-plugins < 2 line is ineffective because
the RHEL 9 containernetworking-plugins package has Epoch:1, making the
version 1:1.9.0 already greater than 0:2. This Obsoletes never fires
during upgrades.

Additionally, the BIFROST team needs to re-package containernetworking-plugins
for RHEL 10 (for kubelet/cri-o use), and this Obsoletes prevents
co-installation. The line has already been dropped in c11s.

Resolves: RHEL-212289
Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2026-08-19 12:45:39 +02:00
parent a8fc88fc2a
commit 105001c184

View File

@ -15,7 +15,7 @@
Name: containers-common
Epoch: 6
Version: %{container_libs_version}
Release: 2%{?dist}
Release: 3%{?dist}
License: Apache-2.0
BuildArch: noarch
# for BuildRequires: go-md2man
@ -26,7 +26,6 @@ BuildRequires: go-md2man
Provides: skopeo-containers = %{epoch}:%{version}-%{release}
Requires: (container-selinux >= 2:2.162.1 if selinux-policy)
Requires: netavark
Obsoletes: containernetworking-plugins < 2
Suggests: fuse-overlayfs
# Conflict versions using the old config file loading to avoid mismatch between code and configs.
Conflicts: podman < 5:6
@ -250,6 +249,9 @@ ln -s ../../../..%{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/
%files extra
%changelog
* Wed Aug 19 2026 Jindrich Novy <jnovy@redhat.com> - 6:6.0-3
- Drop ineffective Obsoletes for containernetworking-plugins (RHEL-212289)
* Thu Jul 02 2026 Jindrich Novy <jnovy@redhat.com> - 6:6.0-2
- fix broken rootless storage.conf mount option (metacopy=on conflicts with
userxattr) - split storage vendor config into separate rootful and rootless