Skip to content

Commit 0ac8612

Browse files
committed
Change the go version on Ubuntu to a minimum
1 parent 2e9d7f6 commit 0ac8612

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Set the Go version as a minimum on Ubuntu

uyuni-tools.spec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ BuildRequires: golang(API) >= 1.25
8383

8484
%if 0%{?ubuntu}
8585
%define go_version 1.22
86-
BuildRequires: golang-%{go_version}
86+
BuildRequires: golang >= %{go_version}
8787
%endif
8888
# ubuntu
8989

@@ -324,7 +324,9 @@ go_tags=""
324324

325325
go_path=""
326326
%if 0%{?ubuntu}
327-
go_path=/usr/lib/go-%{go_version}/bin/
327+
if test -d /usr/lib/go-%{go_version}/bin/; then
328+
go_path=/usr/lib/go-%{go_version}/bin/
329+
fi
328330
%else
329331
%if "%{?_go_bin}" != ""
330332
go_path='%{_go_bin}/'

0 commit comments

Comments
 (0)