[dhewm3/f32: 3/3] Update to latest snapshot, drop CentOS/RHEL 7 support

commit b774016b5650d069537ef21f63cf3b531d98d730 Author: Simone Caronni <negativo17(a)gmail.com&gt; Date: Fri Dec 4 13:17:35 2020 +0100 Update to latest snapshot, drop CentOS/RHEL 7 support .gitignore | 1 + dhewm3.spec | 20 +++++++++++++------- sources | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) --- diff --git a/.gitignore b/.gitignore index 3257e56..d13749f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ dhewm3-1.3.1.1304-657ad99.tar.gz dhewm3-89f227b.tar.gz /dhewm3-d535e54.tar.gz /dhewm3-f24f18a.tar.gz +/dhewm3-bbe30e3.tar.gz diff --git a/dhewm3.spec b/dhewm3.spec index 1662261..25e1a98 100644 --- a/dhewm3.spec +++ b/dhewm3.spec @@ -1,5 +1,7 @@ -%global commit0 f24f18a61e7c05e1d8e2bf1da962e2587b1ef97a -%global date 20191103 +%global __cmake_in_source_build 1 + +%global commit0 bbe30e300c1618207f447927b0accedd51ab8769 +%global date 20201102 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) #global tag %{version} @@ -7,7 +9,7 @@ Name: dhewm3 Version: 1.5.1 -Release: 4%{!?tag:.%{date}git%{shortcommit0}}%{?dist} +Release: 5%{!?tag:.%{date}git%{shortcommit0}}%{?dist} Summary: Dhewm's Doom 3 engine License: GPLv3+ with exceptions URL: https://dhewm3.org/ @@ -28,7 +30,7 @@ Provides: doom3-engine = 1.3.1.1304 Provides: bundled(minizip-idsoftware) = 1.2.7 -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libcurl-devel BuildRequires: libjpeg-turbo-devel @@ -51,16 +53,16 @@ cp %{SOURCE1} ./Fedora-README.txt iconv -f iso8859-1 -t utf-8 COPYING.txt > COPYING.txt.conv && mv -f COPYING.txt.conv COPYING.txt %build +export CXXFLAGS="%{optflags} -std=c++0x" # Passing a fake build name avoids default CMAKE_BUILD_TYPE="RelWithDebInfo" # which has hard coded GCC optimizations. -export CXXFLAGS="%{optflags} -std=c++0x" %cmake \ -DCMAKE_BUILD_TYPE=Fedora \ -DCORE=ON -DBASE=ON -DD3XP=ON \ -DDEDICATED=ON \ -DSDL2=ON \ neo -%cmake3_build +%cmake_build %post /usr/sbin/alternatives --install %{_bindir}/doom3-engine doom3-engine %{_bindir}/%{name} 10 @@ -71,7 +73,7 @@ if [ "$1" = 0 ]; then fi %install -%cmake3_install +%cmake_install %files %license COPYING.txt @@ -81,6 +83,10 @@ fi %{_libdir}/%{name} %changelog +* Fri Dec 04 2020 Simone Caronni <negativo17(a)gmail.com&gt; - 1.5.1-5.20201102gitbbe30e3 +- Update to latest snapshot. +- Drop CentOS/RHEL 7 support, ALSA is too old for updates. + * Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.5.1-4.20191103gitf24f18a - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index c1e4b04..26bf922 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dhewm3-f24f18a.tar.gz) = 3ee1999e93df22574cc871130da3b1c1f490f825fb60ab405d19dedc68831987f0c51dd46114e39a11435108eb116f3c7fee4b210a0005683be7f50adb3333ff +SHA512 (dhewm3-bbe30e3.tar.gz) = 6209506e656da6223c51203f7e4351819d8f955e93f6d72d88b71616f1440e08412927790fef28781375e9e72c7f28bfcca53ab2a4e0d8194f673bb6d97b3dbb