From 8967de99ff87b8627242e345a86b373ea6409a03 Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Tue, 12 Mar 2019 15:44:08 +0100 Subject: [PATCH] el6: Upgrade to devtools-7 --- icinga2.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/icinga2.spec b/icinga2.spec index 8021fe5..2e1a0d9 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -125,11 +125,12 @@ BuildRequires: libopenssl1-devel BuildRequires: libstdc++48-devel %else %if "%{_vendor}" == "redhat" && (0%{?el6} || 0%{?rhel} == 6 || "%{?dist}" == ".el6") -# Requires devtoolset-2 scl -BuildRequires: devtoolset-2-binutils -BuildRequires: devtoolset-2-gcc-c++ -BuildRequires: devtoolset-2-libstdc++-devel -%define scl_enable scl enable devtoolset-2 -- +# Requires devtoolset-7 scl +%define scl_name devtoolset-7 +%define scl_enable scl enable %{scl_name} -- +BuildRequires: %{scl_name}-binutils +BuildRequires: %{scl_name}-gcc-c++ +BuildRequires: %{scl_name}-libstdc++-devel %else BuildRequires: gcc-c++ BuildRequires: libstdc++-devel