Skip to content

Commit

Permalink
tools: Build with a different Go toolset on rhel-8
Browse files Browse the repository at this point in the history
Thanks to Tom Stellard <[email protected]>.

Closes cockpit-project#9084
  • Loading branch information
martinpitt authored and mvollmer committed May 2, 2018
1 parent c198391 commit 85bb3e0
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions tools/cockpit.spec
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@
%define libssh_version 0.6.0
%endif

%if 0%{?rhel} >= 8
%global go_scl_prefix go-toolset-7-
%else
%global go_scl_prefix %{nil}
%endif

Name: cockpit
Summary: A user interface for Linux servers

Expand Down Expand Up @@ -340,6 +346,10 @@ rm %{buildroot}/usr/share/pixmaps/cockpit-sosreport.png
Cockpit runs in a browser and can manage your network of GNU/Linux
machines.

%if 0%{?rhel} >= 8
%enable_gotoolset7
%endif

%files
%{_docdir}/%{name}/AUTHORS
%{_docdir}/%{name}/COPYING
Expand Down Expand Up @@ -736,8 +746,8 @@ Requires: /usr/bin/kubectl
# Requires: Needs newer localization support
Requires: %{name}-bridge >= %{required_base}
Requires: %{name}-shell >= %{required_base}
BuildRequires: golang-bin
BuildRequires: golang-src
BuildRequires: %{go_scl_prefix}golang-bin
BuildRequires: %{go_scl_prefix}golang-src
Provides: cockpit-stub = %{version}-%{release}

%description kubernetes
Expand Down

0 comments on commit 85bb3e0

Please sign in to comment.