From f82824a7a1978597ae2a834de4dcdd76b94358ae Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 14 Sep 2023 10:46:06 -0400 Subject: [PATCH] rpm: correctly obsolete older rpm builds The prior change in #268 didn't completely obsolete older builds of gvisor-tap-vsock, causing installation conflicts with the official Fedora builds. This commit should correctly obsolete fedora packages. Ref: https://cirrus-ci.com/task/5730166412935168 This change should also address installation conflicts in cockpit-reverse dependency tests on podman upstream Ref: https://artifacts.dev.testing-farm.io/716a3cac-ab80-4eb8-921c-da3a784b94fb/ Signed-off-by: Lokesh Mandvekar --- rpm/gvisor-tap-vsock.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpm/gvisor-tap-vsock.spec b/rpm/gvisor-tap-vsock.spec index 74932daf3..c691daebf 100644 --- a/rpm/gvisor-tap-vsock.spec +++ b/rpm/gvisor-tap-vsock.spec @@ -70,6 +70,8 @@ dynamic port forwarding. %package gvforwarder Summary: %{desc_gvforwarder} Provides: gvforwarder = %{epoch}:%{version}-%{release} +Obsoletes: %{name} < 6:0.7.0-6 +Recommends: %{name} = %{epoch}:%{version}-%{release} %description gvforwarder %{desc_gvforwarder}