commit 301b4724102e232884c2eb08325f845e2c7cd555 Author: Hans de Goede <hdegoede(a)redhat.com&gt; Date: Tue Dec 18 09:15:43 2018 +0100 Update to upstream d1x-rebirth stable-0.60.x branch a.d. 18-12-2018 Fixes d2x-rebirth crashing when the descent 2 mvl (movie) files are present .gitignore | 1 + d1x.spec | 18 ++++++++++++------ sources | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) --- diff --git a/.gitignore b/.gitignore index 18bd213..15662a3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ d1swdf.tar.gz d1x-rebirth_v0.58.1-src.tar.gz /d2shar10.tar.gz /stable-0.60.x.zip +/dxx-rebirth-af25483.tar.gz diff --git a/d1x.spec b/d1x.spec index 3c1d1cc..5d0568f 100644 --- a/d1x.spec +++ b/d1x.spec @@ -1,14 +1,16 @@ +# Upstream is not really good in doing timely releases, so we use +# a git snapshot of the dxx-rebirth stable-0.60.x branch %global rebirth_version 0.60 +%global snapshotdate 20181218 +%global commit af25483d01e444553b70cf70c2c7fb8403875f71 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) Summary: Descent 1 game and shareware data files (d1x-rebirth version) Name: d1x Version: 1.43 -Release: 19.rebirth_v%{rebirth_version}%{?dist} +Release: 20.rebirth_v%{rebirth_version}.%{snapshotdate}git%{shortcommit}%{?dist} License: non-commercial -# stable-0.60.x branch snapshot downloaded from -# https://github.com/dxx-rebirth/dxx-rebirth/archive/stable-0.60.x.zip -# on 16-12-2018, git hash of HEAD b43a351aa90d125a034e68e8b5762ea2dd8bcb93 -Source0: stable-0.60.x.zip +Source0: https://github.com/dxx-rebirth/dxx-rebirth/archive/%{commit}/dxx-rebirth-... Source1: d1x-rebirth.sh Source2: d2x-rebirth.sh Source3: d1swdf.tar.gz @@ -59,7 +61,7 @@ robots-h.mvl files to the dir. %prep -%setup -q -n dxx-rebirth-stable-%{rebirth_version}.x -a 3 -a 4 +%setup -q -n dxx-rebirth-%{commit} -a 3 -a 4 # Fixup encoding and CTRL+Z at the end of the orderfrm.txt files iconv -f CP850 -t UTF-8 d1shar/ORDERFRM.TXT | head -n-3 > ORDERFRM.TXT touch -r d1shar/ORDERFRM.TXT ORDERFRM.TXT @@ -147,6 +149,10 @@ appstream-util validate-relax --nonet \ %changelog +* Tue Dec 18 2018 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 1.43-20.rebirth_v0.60.20181218gitaf25483 +- Update to upstream d1x-rebirth stable-0.60.x branch a.d. 18-12-2018 +- Fixes d2x-rebirth crashing when the descent 2 mvl (movie) files are present + * Sun Dec 16 2018 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 1.43-19.rebirth_v0.60 - Update to upstream d1x-rebirth stable-0.60.x branch a.d. 16-12-2018 (rf5026) - Merge d1x-shareware package into the main-package so that installing d1x diff --git a/sources b/sources index fad4e76..e6b950f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 8112d6127a7a81a36735f5a9c3175ec2 d1swdf.tar.gz 1b952cc4a4419e24d230589027d73490 d2shar10.tar.gz -b94994c64922d152a3f3a317184c061e stable-0.60.x.zip +9baf66ac3dedfc234a77419d5dcfa253 dxx-rebirth-af25483.tar.gz