diff --git a/libreoffice.changes b/libreoffice.changes index b29e4d3..702d1c0 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -4,6 +4,7 @@ Sat Mar 2 19:41:04 UTC 2024 - Fridrich Strba - Update to 24.2.1.2 (24.2.1 final): https://wiki.documentfoundation.org/Releases/24.2.1/RC1 and https://wiki.documentfoundation.org/Releases/24.2.1/RC2 +- Allow building with gcc >= 12 on system where it is the default ------------------------------------------------------------------- Sat Mar 2 13:12:07 UTC 2024 - Fridrich Strba diff --git a/libreoffice.spec b/libreoffice.spec index c62cf07..f09483e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -51,6 +51,9 @@ %bcond_with system_harfbuzz %endif %bcond_with firebird +%if 0%{?gcc_version} < 12 +%define with_gcc 12 +%endif Name: libreoffice Version: 24.2.1.2 Release: 0 @@ -326,8 +329,8 @@ BuildRequires: libmariadb-devel BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libopenjp2) %endif -BuildRequires: gcc12 -BuildRequires: gcc12-c++ +BuildRequires: gcc%{with_gcc} +BuildRequires: gcc%{with_gcc}-c++ BuildRequires: java-devel >= 1.8 %if 0%{?suse_version} # needed by python3_sitelib @@ -1089,8 +1092,10 @@ CFLAGS="$ARCH_FLAGS" CXXFLAGS="-std=c++20 $ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS -export CC=gcc-12 -export CXX=g++-12 +%if 0%{?with_gcc:1} +export CC=gcc-%{with_gcc} +export CXX=g++-%{with_gcc} +%endif # Fake the epoch stuff in generated zip files export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%%s)