Unify the build with Fedora
There's no need to do a build just for this. Resolves: RHEL-61904
This commit is contained in:
parent
ed2088ef6f
commit
7371d291e2
@ -20,7 +20,7 @@ Version: 0.0.99.6
|
|||||||
%global toolbx_go 1.20
|
%global toolbx_go 1.20
|
||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%global toolbx_go 1.22
|
%global toolbx_go 1.22.7
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
@ -28,6 +28,8 @@ Version: 0.0.99.6
|
|||||||
%global toolbx_go 1.22.5
|
%global toolbx_go 1.22.5
|
||||||
%elif 0%{?rhel} == 10
|
%elif 0%{?rhel} == 10
|
||||||
%global toolbx_go 1.22.5
|
%global toolbx_go 1.22.5
|
||||||
|
%elif 0%{?rhel} > 10
|
||||||
|
%global toolbx_go 1.23.1
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -89,6 +91,9 @@ BuildRequires: pkgconfig(fish)
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Recommends: skopeo
|
Recommends: skopeo
|
||||||
|
%if ! 0%{?rhel}
|
||||||
|
Recommends: fuse-overlayfs
|
||||||
|
%endif
|
||||||
|
|
||||||
Requires: containers-common
|
Requires: containers-common
|
||||||
Requires: podman >= 1.6.4
|
Requires: podman >= 1.6.4
|
||||||
@ -148,7 +153,7 @@ The %{name}-tests package contains system tests for %{name}.
|
|||||||
%patch -P200 -p1
|
%patch -P200 -p1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?rhel} == 10
|
%if 0%{?rhel} >= 10
|
||||||
%patch -P201 -p1
|
%patch -P201 -p1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user