From 38e069f70a0231a9a141bfcfa38be5e44aa96f8f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 13 Sep 2023 15:17:22 -0400 Subject: [PATCH] [CI:BUILD] rpm: hard dependency on gvisor-tap-vsock-gvforwarder With https://github.com/containers/gvisor-tap-vsock/pull/268, gvforwarder is now provided via the subpackage `gvisor-tap-vsock-gvforwarder`. FCOS needs this gvforwarder, hence the hard dependency. This change is only intended for f38 and higher. [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar --- rpm/podman.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rpm/podman.spec b/rpm/podman.spec index 242ee13701..b3f7045b6f 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -37,7 +37,7 @@ # include it. Official rawhide should be able to fetch the last active build of # gvproxy, the min version requirement has been removed to allow it. # Ref: https://bugzilla.redhat.com/show_bug.cgi?id=2224434 -%if !%{defined copr_username} && 0%{?fedora} <= 38 +%if !%{defined copr_username} && 0%{?fedora} <= 37 %define gvproxy_subpackage 1 %endif @@ -130,6 +130,11 @@ Recommends: %{name}-gvproxy = %{epoch}:%{version}-%{release} %else Recommends: %{name}-gvproxy %endif +# gvforwarder subpackage exists only on f38 and higher as part of the +# gvisor-tap-vsock package. +%if %{defined fedora} && 0%{?fedora} >= 38 +Requires: gvisor-tap-vsock-gvforwarder +%endif Provides: %{name}-quadlet Obsoletes: %{name}-quadlet <= 5:4.4.0-1 Provides: %{name}-quadlet = %{epoch}:%{version}-%{release}