diff --git a/marble.changes b/marble.changes index 32d7d44..5711418 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 1 20:23:17 UTC 2024 - Christophe Marin + +- Build marble with GCC 13 on Leap 15 + ------------------------------------------------------------------- Fri Feb 23 14:00:47 UTC 2024 - Christophe Marin diff --git a/marble.spec b/marble.spec index 25e51a9..dd38fb1 100644 --- a/marble.spec +++ b/marble.spec @@ -33,6 +33,10 @@ Source2: applications.keyring %endif BuildRequires: extra-cmake-modules BuildRequires: fdupes +%if 0%{?suse_version} == 1500 +BuildRequires: gcc13-c++ +BuildRequires: gcc13-PIE +%endif BuildRequires: libqt5-qtlocation-devel BuildRequires: libshp-devel BuildRequires: perl @@ -160,9 +164,14 @@ The astronomy library for the satellites plugin. %build export SUSE_ASNEEDED=0 -%ifarch ppc ppc64 -export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" +%if 0%{?suse_version} == 1500 + export CXX=g++-13 %endif + +%ifarch ppc ppc64 + export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" +%endif + %cmake_kf5 -d build -- -DBUILD_MARBLE_TESTS=NO -DMOBILE=OFF -DQT_PLUGINS_DIR=%{_kf5_plugindir} %cmake_build