commit 8b2bb773f7c54dc2c555e36023cda57f18bb2bdc Author: Hans de Goede <hdegoede(a)redhat.com&gt; Date: Sat Feb 6 20:13:49 2021 +0100 Upstream no longer does regular releases, instead they release weekly snapshots Update to 20210126 snapshot Fix FTBFS .gitignore | 1 + d1x.rpmlintrc | 8 ++++++++ d1x.spec | 25 ++++++++++++++----------- sources | 6 +++--- 4 files changed, 26 insertions(+), 14 deletions(-) --- diff --git a/.gitignore b/.gitignore index 15662a3..8382445 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ d1x-rebirth_v0.58.1-src.tar.gz /d2shar10.tar.gz /stable-0.60.x.zip /dxx-rebirth-af25483.tar.gz +/dxx-rebirth-1afd0ee.tar.gz diff --git a/d1x.rpmlintrc b/d1x.rpmlintrc new file mode 100644 index 0000000..56fa2cb --- /dev/null +++ b/d1x.rpmlintrc @@ -0,0 +1,8 @@ +# /usr/dxx/full and hog file names are not a spelling errors +addFilter("spelling-error %description .*") +# This is why this is in rpmfusion nonfree +addFilter("W: invalid-license non-commercial") +# We don't have manpages for d1x +addFilter("W: no-manual-page-for-binary .*") +# We don't have an URL for this anymore +addFilter("W: invalid-url Source3: d1swdf.tar.gz") diff --git a/d1x.spec b/d1x.spec index 83f240d..e63dc5e 100644 --- a/d1x.spec +++ b/d1x.spec @@ -1,14 +1,12 @@ -# 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 +# Upstream does not do releases, they rely on weekly git snapshot builds +%global snapshotdate 20210126 +%global commit 1afd0eeae2819e641ecae6a974f74e41982ca13d %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: 27.rebirth_v%{rebirth_version}.%{snapshotdate}git%{shortcommit}%{?dist} +Release: 28.rebirth.%{snapshotdate}git%{shortcommit}%{?dist} License: non-commercial Source0: https://github.com/dxx-rebirth/dxx-rebirth/archive/%{commit}/dxx-rebirth-... Source1: d1x-rebirth.sh @@ -20,7 +18,7 @@ Source6: d2x-rebirth.appdata.xml Patch0: d1x-gcc10.patch URL: https://www.dxx-rebirth.com/ BuildRequires: gcc gcc-c++ libpng-devel -BuildRequires: SDL-devel SDL_mixer-devel mesa-libGL-devel mesa-libGLU-devel +BuildRequires: SDL-devel SDL_mixer-devel SDL_image-devel mesa-libGL-devel mesa-libGLU-devel BuildRequires: physfs-devel scons desktop-file-utils dos2unix BuildRequires: ImageMagick libappstream-glib Requires: opengl-games-utils >= 0.2 @@ -34,7 +32,7 @@ Obsoletes: %{name}-shareware < %{version}-%{release} %description D1X is a modification of the Descent 1 source that was released by Parallax. It's mostly compatible with the Descent 1 v1.5, both in -multiplayer and on the local machine. +multi-player and on the local machine. This package comes with the shareware version of the game. If you want to play the full (registered/commercial) version of the game, place the @@ -50,7 +48,7 @@ Requires: timidity++-patches %description -n d2x D2X is a modification of the Descent 2 source that was released by Parallax. -It's mostly compatible with the original Descent 2, both in multiplayer and +It's mostly compatible with the original Descent 2, both in multi-player and on the local machine. This package comes with the shareware version of the game. If you want to @@ -134,7 +132,7 @@ appstream-util validate-relax --nonet \ %files -%doc d1x-rebirth/README.txt d1x-rebirth/RELEASE-NOTES.txt +%doc README.md d1x-rebirth/RELEASE-NOTES.txt %license COPYING.txt GPL-3.txt descent1-shareware-readmes %{_bindir}/d1x-rebirth* %{_datadir}/d1x @@ -143,7 +141,7 @@ appstream-util validate-relax --nonet \ %{_datadir}/icons/hicolor/128x128/apps/d1x-rebirth.png %files -n d2x -%doc d2x-rebirth/README.txt d2x-rebirth/RELEASE-NOTES.txt +%doc README.md d2x-rebirth/RELEASE-NOTES.txt %license COPYING.txt GPL-3.txt descent2-shareware-readmes %{_bindir}/d2x-rebirth* %{_datadir}/d2x @@ -153,6 +151,11 @@ appstream-util validate-relax --nonet \ %changelog +* Sat Feb 06 2021 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; - 1.43-28.rebirth.20210126git1afd0ee +- Upstream no longer does regular releases, instead they release weekly snapshots +- Update to 20210126 snapshot +- Fix FTBFS + * Thu Feb 04 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.43-27.rebirth_v0.60.20181218gitaf25483 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index e6b950f..b2cd9f5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -8112d6127a7a81a36735f5a9c3175ec2 d1swdf.tar.gz -1b952cc4a4419e24d230589027d73490 d2shar10.tar.gz -9baf66ac3dedfc234a77419d5dcfa253 dxx-rebirth-af25483.tar.gz +SHA512 (dxx-rebirth-1afd0ee.tar.gz) = c12eae520fb4e29aaf1a2a2df1e500be048b150451cc164531f45a6800743d33b8a6a7ba72437d1177d20d1182b66e04dfc85943a4ebdf8eba104323601cfad8 +SHA512 (d1swdf.tar.gz) = fa494be02e629e6772d87851a9ebdd36a64b38f5706f8290abd354919bc1b498d5162b1d7e4720948c1698c343ef17c694ddfafa926e8dc28582a7d429b4360e +SHA512 (d2shar10.tar.gz) = 8aeb7dbc5d98ae98caa22b0741309c7451d662f569a889dfaaca5c0333895144d962cbde6276a121103266f40ca73485872f9dbc2bd11405d71f2af58f553e9a