From 413bb8a791ce9515aadfc625dbfcf73c8308eced Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Wed, 23 Feb 2022 08:53:28 -0500
Subject: [PATCH] containers-common-1-30.el9

- archful package should conflict with older noarch package
- Related: #2000051

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 containers-common.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/containers-common.spec b/containers-common.spec
index e90d4da..6fd919f 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -12,11 +12,12 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 29%{?dist}
+Release: 30%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildRequires: /usr/bin/go-md2man
 Provides: skopeo-containers = %{epoch}:%{version}-%{release}
+Conflicts: %{name} <= 2:1-22
 Obsoletes: %{name} <= 2:1-22
 Requires: (container-selinux >= 2:2.162.1 if selinux-policy)
 Requires: oci-runtime
@@ -80,7 +81,7 @@ separately.
 
 %package -n aardvark-dns
 Version: 1.0.0
-Release: 29%{?dist}
+Release: 30%{?dist}
 URL: https://github.com/containers/aardvark-dns
 Summary: Authoritative DNS server for A/AAAA container records
 License: ASL 2.0 and BSD and MIT
@@ -99,7 +100,7 @@ Read more about configuration in `src/backend/mod.rs`.
 
 %package -n netavark
 Version: 1.0.0
-Release: 29%{?dist}
+Release: 30%{?dist}
 URL: https://github.com/containers/netavark
 Summary: OCI network stack
 License: ASL 2.0 and BSD and MIT
@@ -259,6 +260,10 @@ EOF
 %{_mandir}/man1/netavark.1*
 
 %changelog
+* Wed Feb 23 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-30
+- archful package should conflict with older noarch package
+- Related: #2000051
+
 * Tue Feb 22 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-29
 - consistent release tags for all packages
 - Related: #2000051