From 8a5cf75846f0acf10ca74ff7296cbc95c7465d2f Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Mon, 13 Jun 2022 19:12:48 +0200 Subject: [PATCH] bareos.spec: adapt to openSUSE_15.4 --- core/platforms/packaging/bareos.spec | 29 ++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec index 68707ac2757..7a5d2090030 100644 --- a/core/platforms/packaging/bareos.spec +++ b/core/platforms/packaging/bareos.spec @@ -123,13 +123,18 @@ BuildRequires: devtoolset-8-gcc BuildRequires: devtoolset-8-gcc-c++ %endif -%if 0%{?sle_version} >= 150300 || 0%{?suse_version} > 1500 +%if 0%{?sle_version} == 150400 +BuildRequires: gcc11 +BuildRequires: gcc11-c++ +%else + %if 0%{?sle_version} == 150300 || 0%{?suse_version} > 1500 BuildRequires: gcc10 BuildRequires: gcc10-c++ -%else - %if 0%{?suse_version} + %else + %if 0%{?suse_version} BuildRequires: gcc9 BuildRequires: gcc9-c++ + %endif %endif %endif @@ -963,18 +968,18 @@ source /opt/rh/devtoolset-8/enable %endif # use modern compiler on suse -%if 0%{?sle_version} >= 150300 || 0%{?suse_version} > 1500 - -type gcc-10 && CC=gcc-10 && export CC -type g++-10 && CXX=g++-10 && export CXX - -type gcc-11 && CC=gcc-11 && export CC -type g++-11 && CXX=g++-11 && export CXX - +%if 0%{?sle_version} == 150400 +CC=gcc-11 ; export CC +CXX=g++-11 ; export CXX %else - %if 0%{?suse_version} + %if 0%{?sle_version} == 150300 || 0%{?suse_version} > 1500 +CC=gcc-10 ; export CC +CXX=g++-10 ; export CXX + %else + %if 0%{?suse_version} CC=gcc-9 ; export CC CXX=g++-9 ; export CXX + %endif %endif %endif