Skip to content

Commit

Permalink
[CI:BUILD] rpm: hard dependency on gvisor-tap-vsock-gvforwarder
Browse files Browse the repository at this point in the history
With containers/gvisor-tap-vsock#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 <[email protected]>
  • Loading branch information
lsm5 committed Sep 13, 2023
1 parent 7d6722b commit 38e069f
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion rpm/podman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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}
Expand Down

0 comments on commit 38e069f

Please sign in to comment.