Make Leap 15.x builds succeed

This commit is contained in:
Jan Engelhardt 2024-09-23 15:54:38 +02:00
parent e22d0947c1
commit 825f56ff61
2 changed files with 13 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 23 13:54:27 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
- Make Leap 15.x builds succeed.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 22 07:57:41 UTC 2024 - Jan Engelhardt <jengelh@inai.de> Sun Sep 22 07:57:41 UTC 2024 - Jan Engelhardt <jengelh@inai.de>

View File

@ -26,7 +26,11 @@ Group: Amusements/Games/3D/Shoot
URL: https://github.com/DescentDevelopers/Descent3 URL: https://github.com/DescentDevelopers/Descent3
Source: https://github.com/DescentDevelopers/Descent3/archive/%commit.tar.gz Source: https://github.com/DescentDevelopers/Descent3/archive/%commit.tar.gz
Patch1: system-libacm.patch Patch1: system-libacm.patch
%if 0%{?suse_version} && 0%{?suse_version} < 1600
BuildRequires: gcc11-c++
%else
BuildRequires: c++_compiler BuildRequires: c++_compiler
%endif
BuildRequires: cmake BuildRequires: cmake
BuildRequires: libacm-devel BuildRequires: libacm-devel
BuildRequires: plog-devel BuildRequires: plog-devel
@ -54,8 +58,12 @@ different game types.
%autosetup -p1 -n Descent3-%commit %autosetup -p1 -n Descent3-%commit
%build %build
%if 0%{?suse_version} && 0%{?suse_version} < 1600
export CXX=g++-11
%endif
%cmake -DCMAKE_INSTALL_BINDIR="%_libexecdir/%name" \ %cmake -DCMAKE_INSTALL_BINDIR="%_libexecdir/%name" \
-DCMAKE_INSTALL_DATADIR="%_datadir/%name" \ -DCMAKE_INSTALL_DATADIR="%_datadir/%name" \
-DCMAKE_INSTALL_DOCDIR:PATH="share/doc/packages/%name" \
-DFORCE_PORTABLE_INSTALL=OFF -DUSE_EXTERNAL_PLOG=ON \ -DFORCE_PORTABLE_INSTALL=OFF -DUSE_EXTERNAL_PLOG=ON \
-DCMAKE_C_FLAGS_RELWITHDEBINFO="%optflags" \ -DCMAKE_C_FLAGS_RELWITHDEBINFO="%optflags" \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%optflags" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%optflags"