From 6a07642c576b1c6d9fb86529a6957d410fe496b21a91e53e6c7df1e6d9b0834c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 8 Aug 2023 00:35:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1098 --- libreoffice.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index f089090..bb9ff71 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -318,13 +318,13 @@ BuildConflicts: java-devel < 9 BuildConflicts: java-headless < 9 BuildRequires: pkgconfig(libopenjp2) %endif -# Dragonbox requires gcc11 +# Dragonbox requires C++17 %if 0%{?is_opensuse} || 0%{?sle_version} >= 150000 BuildRequires: gcc >= 7 BuildRequires: gcc-c++ >= 7 %else -BuildRequires: gcc11 -BuildRequires: gcc11-c++ +BuildRequires: gcc7 +BuildRequires: gcc7-c++ %endif %if 0%{?suse_version} # needed by python3_sitelib @@ -1099,8 +1099,8 @@ CXXFLAGS="-std=c++17 $ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS %if !0%{?is_opensuse} && 0%{?sle_version} < 150000 -export CC=gcc-11 -export CXX=g++-11 +export CC=gcc-7 +export CXX=g++-7 %endif # Fake the epoch stuff in generated zip files