From 7371d291e20f7b8facdd86a50e3b344aaea00f6d Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Fri, 1 Nov 2024 02:06:37 +0100
Subject: [PATCH] Unify the build with Fedora

There's no need to do a build just for this.

Resolves: RHEL-61904
---
 toolbox.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/toolbox.spec b/toolbox.spec
index be07c48..fe2c97e 100644
--- a/toolbox.spec
+++ b/toolbox.spec
@@ -20,7 +20,7 @@ Version:       0.0.99.6
 %global toolbx_go 1.20
 
 %if 0%{?fedora}
-%global toolbx_go 1.22
+%global toolbx_go 1.22.7
 %endif
 
 %if 0%{?rhel}
@@ -28,6 +28,8 @@ Version:       0.0.99.6
 %global toolbx_go 1.22.5
 %elif 0%{?rhel} == 10
 %global toolbx_go 1.22.5
+%elif 0%{?rhel} > 10
+%global toolbx_go 1.23.1
 %endif
 %endif
 
@@ -89,6 +91,9 @@ BuildRequires: pkgconfig(fish)
 %endif
 
 Recommends:    skopeo
+%if ! 0%{?rhel}
+Recommends:    fuse-overlayfs
+%endif
 
 Requires:      containers-common
 Requires:      podman >= 1.6.4
@@ -148,7 +153,7 @@ The %{name}-tests package contains system tests for %{name}.
 %patch -P200 -p1
 %endif
 
-%if 0%{?rhel} == 10
+%if 0%{?rhel} >= 10
 %patch -P201 -p1
 %endif