commit f5555ecfae62e7856a20daebf15ae84fc8d8a201 Author: Ben Rosser <rosser.bjr(a)gmail.com&gt; Date: Mon Apr 20 20:04:45 2020 -0400 Update to release with 0.47.04 support. dfhack.spec | 32 ++++++++++++++++++++------------ git-describe.h | 8 ++++---- 2 files changed, 24 insertions(+), 16 deletions(-) --- diff --git a/dfhack.spec b/dfhack.spec index 5fb9f96..fede923 100644 --- a/dfhack.spec +++ b/dfhack.spec @@ -6,17 +6,21 @@ # Autogenerate commit lines from prepare-dfhack-release: # dfhack submodule: depends/clsocket -%global commit10 6a9153d053a250be34996b3fd86ac1166c3e17cb +%global commit10 8340c07802078d905e60e294211a1807ec6f0161 # dfhack submodule: depends/jsoncpp-sub %global commit11 ddabf50f72cf369bf652a95c4d9fe31a1865a781 # dfhack submodule: library/xml -%global commit12 018558e3c2e3ff08a24a66f622a4a5ca45ea4173 +%global commit12 d51a1c4ca36731db62517b699fddd2c011e6bc99 # dfhack submodule: plugins/isoworld -%global commit13 fbbf9e46458e41707c27f2a4438452a579490db1 +%global commit13 e3c49ab017da2dcbeaadccd10e56d07d8f03b4ca +# dfhack submodule: plugins/isoworld/agui +#global commit14 1bd1b32083a62b4b851c81d41cceb4e5be6d08b4 +# dfhack submodule: plugins/isoworld/allegro +#global commit15 8f4dd2f4a9a3d0028f903681a95e0587586ed0b1 # dfhack submodule: plugins/stonesense -%global commit14 4fdb2be54365442b8abea86f21746795f83fbdc2 +%global commit14 b9fc28836f34f7ce1be64de94afd90184a341c7d # dfhack submodule: scripts -%global commit15 c8ea01c2f45a2ef0bd4c363c44e4c06b0185486a +%global commit15 e336520c09dbcd55bb9f7b3ca837d102a9026acf # End autogenerated commit lines. @@ -29,8 +33,8 @@ %global shortcommit15 %(c=%{commit14}; echo ${c:0:7}) # dfhack version string. -%global dfversion 0.47.03 -%global hackrelease alpha0 +%global dfversion 0.47.04 +%global hackrelease beta1 # Define dfhack build architecture. %global dfhack_arch 32 @@ -74,10 +78,11 @@ Source14: https://github.com/DFHack/stonesense/archive/%{commit14}/dfhack- Source15: https://github.com/DFHack/scripts/archive/%{commit15}/dfhack-scripts-%{sh... # Patch to unbundle Agui from dfhack-plugins-isoworld. -Patch0: isoworld-external-allegro-agui.patch +# We're not building isoworld at the moment. +#Patch0: isoworld-external-allegro-agui.patch # Patch to include cmath in isoworld. -Patch1: isoworld-cmath-include.patch +# Patch1: isoworld-cmath-include.patch # See https://github.com/DFHack/dfhack/issues/961 for these isoworld issues. @@ -89,7 +94,7 @@ Patch3: protobuf-gcc-10-fix.patch ExclusiveArch: %{ix86} x86_64 BuildRequires: gcc, git, cmake, zlib-devel, mesa-libGL-devel -BuildRequires: perl-XML-LibXML, perl-XML-LibXSLT, perl-Digest-SHA +BuildRequires: perl-XML-LibXML, perl-XML-LibXSLT, perl-Digest-SHA, perl-File-Copy BuildRequires: gcc-c++ # I think this is necessary now, otherwise the build fails. @@ -217,8 +222,8 @@ cp -a %SOURCE3 library/include/ # Apply patches. This complains about line endings, for some reason... # You know what, don't apply patches. We don't build isoworld, anyway. -%patch0 -p1 -%patch1 -p1 +#patch0 -p1 +#patch1 -p1 # Fix protobuf problem; there's probably a way to do this with the patch macro. patch depends/protobuf/google/protobuf/message.cc %PATCH3 @@ -336,6 +341,9 @@ rm -f docs/build.sh %license LICENSE.rst %changelog +* Mon Apr 20 2020 Ben Rosser <rosser.bjr(a)gmail.com&gt; - 0.47.04-1.beta1 +- Update to latest upstream release with support for 0.47.04. + * Mon Feb 24 2020 Ben Rosser <rosser.bjr(a)gmail.com&gt; - 0.47.03-1.alpha0 - Update to latest upstream release with support for 0.47.03. diff --git a/git-describe.h b/git-describe.h index f379ac4..5ada5ac 100644 --- a/git-describe.h +++ b/git-describe.h @@ -1,6 +1,6 @@ -#define DFHACK_GIT_DESCRIPTION "0.47.03-alpha0-0-g28bf6667" -#define DFHACK_GIT_COMMIT "28bf6667cba0d68f76d5da74b49ee4b355ddd647" -#define DFHACK_GIT_XML_EXPECTED_COMMIT "018558e3c2e3ff08a24a66f622a4a5ca45ea4173" -#define DFHACK_GIT_XML_COMMIT "018558e3c2e3ff08a24a66f622a4a5ca45ea4173" +#define DFHACK_GIT_DESCRIPTION "0.47.04-beta1-0-gc8a0ac14" +#define DFHACK_GIT_COMMIT "c8a0ac146c21400141aeb76b6c3ea09a604f3c81" +#define DFHACK_GIT_XML_EXPECTED_COMMIT "d51a1c4ca36731db62517b699fddd2c011e6bc99" +#define DFHACK_GIT_XML_COMMIT "d51a1c4ca36731db62517b699fddd2c011e6bc99" #define DFHACK_GIT_XML_MATCH #define DFHACK_BUILD_ID ""