[dfhack] Update to 0.44.12-r1, add new jsoncpp submodule.

commit fd1209d9f28530dcc095f81a1456ffbae3dac42b Author: Ben Rosser <rosser.bjr(a)gmail.com&gt; Date: Sat Dec 1 12:34:36 2018 -0500 Update to 0.44.12-r1, add new jsoncpp submodule. .gitignore | 5 +++++ dfhack.spec | 42 ++++++++++++++++++++++++++---------------- git-describe.h | 9 +++++---- prepare-dfhack-release | 3 +++ sources | 9 +++++---- 5 files changed, 44 insertions(+), 24 deletions(-) --- diff --git a/.gitignore b/.gitignore index 5f2d0fd..30e2d80 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,8 @@ /dfhack-df-structures-c3025fe.tar.gz /dfhack-scripts-0b6e4a5.tar.gz /dfhack-stonesense-164d2cd.tar.gz +/dfhack-0.44.12-r1.tar.gz +/dfhack-df-structures-23500e4.tar.gz +/dfhack-jsoncpp-ddabf50.tar.gz +/dfhack-scripts-4a1953f.tar.gz +/dfhack-stonesense-4a1953f.tar.gz diff --git a/dfhack.spec b/dfhack.spec index 51901bb..94ddea1 100644 --- a/dfhack.spec +++ b/dfhack.spec @@ -7,14 +7,16 @@ # dfhack submodule: depends/clsocket %global commit10 6a9153d053a250be34996b3fd86ac1166c3e17cb +# dfhack submodule: depends/jsoncpp-sub +%global commit11 ddabf50f72cf369bf652a95c4d9fe31a1865a781 # dfhack submodule: library/xml -%global commit11 c3025feb80c6f8e7441ea5dcf4f463a9cf89cbbd +%global commit12 23500e4e9bd1885365d0a2ef1746c321c1dd5094 # dfhack submodule: plugins/isoworld -%global commit12 fbbf9e46458e41707c27f2a4438452a579490db1 +%global commit13 fbbf9e46458e41707c27f2a4438452a579490db1 # dfhack submodule: plugins/stonesense -%global commit13 164d2cd1349c090a91c1c19200ad03df9bb16650 +%global commit14 4a1953f27c6acd1ceeb2d5447613c106e708c26c # dfhack submodule: scripts -%global commit14 0b6e4a56392e125c01e24694ddd880bbc652451d +%global commit15 66b39d888e5f2d4f5c194ece08ba62ac7f110478 # End autogenerated commit lines. @@ -24,9 +26,10 @@ %global shortcommit12 %(c=%{commit12}; echo ${c:0:7}) %global shortcommit13 %(c=%{commit13}; echo ${c:0:7}) %global shortcommit14 %(c=%{commit14}; echo ${c:0:7}) +%global shortcommit15 %(c=%{commit14}; echo ${c:0:7}) # dfhack version string. -%global dfversion 0.44.10 +%global dfversion 0.44.12 %global hackrelease r1 # Define dfhack build architecture. @@ -37,7 +40,7 @@ Name: dfhack Version: %{dfversion} -Release: 3.%{hackrelease}%{?dist} +Release: 0.%{hackrelease}%{?dist}.1 Summary: Memory hacking library for Dwarf Fortress and a set of tools that use it # It'd be nice if we could unbundle some of these things, but I suspect it won't happen. @@ -50,10 +53,10 @@ Source0: https://github.com/DFHack/dfhack/archive/%{dfversion}-%{hackrele # Script to actually *run* dfhack, adapted from Arch. # (gets installed as "dfhack-run", "dfhack", and "dwarffortress-hacked"). -Source1: https://mars.arosser.com/fedora/dwarffortress/rpmfusion/dfhack-run +Source1: dfhack-run # pkgconfig file for other plugins to use. -Source2: https://mars.arosser.com/fedora/dwarffortress/rpmfusion/dfhack.pc.in +Source2: dfhack.pc.in # Git describe header, generated by prepare-dfhack-release script. Source3: git-describe.h @@ -64,10 +67,11 @@ Source4: prepare-dfhack-release # Submodules. I started at 10, as there are some loose source files too. # See https://github.com/DFHack/dfhack/blob/master/.gitmodules Source10: https://github.com/DFHack/clsocket/archive/%{commit10}/dfhack-clsocket-%{... -Source11: https://github.com/DFHack/df-structures/archive/%{commit11}/dfhack-df-str... -Source12: https://github.com/DFHack/isoworld/archive/%{commit12}/dfhack-isoworld-%{... -Source13: https://github.com/DFHack/stonesense/archive/%{commit13}/dfhack-stonesens... -Source14: https://github.com/DFHack/scripts/archive/%{commit14}/dfhack-scripts-%{sh... +Source11: https://github.com/open-source-parsers/jsoncpp/archive/%{commit11}/dfhack... +Source12: https://github.com/DFHack/df-structures/archive/%{commit12}/dfhack-df-str... +Source13: https://github.com/DFHack/isoworld/archive/%{commit13}/dfhack-isoworld-%{... +Source14: https://github.com/DFHack/stonesense/archive/%{commit14}/dfhack-stonesens... +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 @@ -82,6 +86,7 @@ ExclusiveArch: %{ix86} x86_64 BuildRequires: gcc, git, cmake, zlib-devel, mesa-libGL-devel BuildRequires: perl-XML-LibXML, perl-XML-LibXSLT, perl-Digest-SHA +BuildRequires: gcc-c++ # I think this is necessary now, otherwise the build fails. BuildRequires: SDL-devel @@ -197,10 +202,11 @@ a plugin for dfhack. # Extract submodules onto the right place. tar xfz %SOURCE10 -C depends/clsocket --strip-components=1 -tar xfz %SOURCE11 -C library/xml --strip-components=1 -tar xfz %SOURCE12 -C plugins/isoworld --strip-components=1 -tar xfz %SOURCE13 -C plugins/stonesense --strip-components=1 -tar xfz %SOURCE14 -C scripts --strip-components=1 +tar xfz %SOURCE11 -C depends/jsoncpp-sub --strip-components=1 +tar xfz %SOURCE12 -C library/xml --strip-components=1 +tar xfz %SOURCE13 -C plugins/isoworld --strip-components=1 +tar xfz %SOURCE14 -C plugins/stonesense --strip-components=1 +tar xfz %SOURCE15 -C scripts --strip-components=1 # Put git-describe.h in the right place. cp -a %SOURCE3 library/include/ @@ -324,6 +330,10 @@ rm -f docs/build.sh %license LICENSE.rst %changelog +* Fri Aug 10 2018 Ben Rosser <rosser.bjr(a)gmail.com&gt; - 0.44.12-0.r1.1 +- Updated to latest upstream release for 0.44.12. +- Add new submodule for jsoncpp. + * Sun Aug 19 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 0.44.10-3.r1 - Rebuilt for Fedora 29 Mass Rebuild binutils issue diff --git a/git-describe.h b/git-describe.h index b38a7e8..96de0e5 100644 --- a/git-describe.h +++ b/git-describe.h @@ -1,5 +1,6 @@ -#define DFHACK_GIT_DESCRIPTION "0.44.10-r1-0-g8cb5e7fa" -#define DFHACK_GIT_COMMIT "8cb5e7fa88a9be00c88f5506c1d3d134dd0f237a" -#define DFHACK_GIT_XML_EXPECTED_COMMIT "c3025feb80c6f8e7441ea5dcf4f463a9cf89cbbd" -#define DFHACK_GIT_XML_COMMIT "c3025feb80c6f8e7441ea5dcf4f463a9cf89cbbd" +#define DFHACK_GIT_DESCRIPTION "0.44.12-r1-0-gc2a64b35" +#define DFHACK_GIT_COMMIT "c2a64b3573abbee549761f5c1c2626eec7a6e81c" +#define DFHACK_GIT_XML_EXPECTED_COMMIT "23500e4e9bd1885365d0a2ef1746c321c1dd5094" +#define DFHACK_GIT_XML_COMMIT "23500e4e9bd1885365d0a2ef1746c321c1dd5094" #define DFHACK_GIT_XML_MATCH +#define DFHACK_BUILD_ID "" diff --git a/prepare-dfhack-release b/prepare-dfhack-release index 7ef1232..95b75a0 100755 --- a/prepare-dfhack-release +++ b/prepare-dfhack-release @@ -65,5 +65,8 @@ echo "#define DFHACK_GIT_XML_EXPECTED_COMMIT \"${GIT_XML_COMMIT}\"" >> git-descr echo "#define DFHACK_GIT_XML_COMMIT \"${GIT_XML_COMMIT}\"" >> git-describe.h echo "#define DFHACK_GIT_XML_MATCH" >> git-describe.h +# For now, set BUILD_ID to empty string. Might not be right! +echo "#define DFHACK_BUILD_ID \"\"" >> git-describe.h + # Delete checkout directory. rm -rf dfhack-${RELEASE_NAME}/ diff --git a/sources b/sources index ccffb7a..4169cb2 100644 --- a/sources +++ b/sources @@ -1,6 +1,7 @@ 35cfdf121436218c1cd9d317c7599bc5 dfhack-isoworld-fbbf9e4.tar.gz -d09ba98637002663c2b69d7ce71ba182 dfhack-0.44.10-r1.tar.gz cd8054e0be8c44c5b03555471a91f78a dfhack-clsocket-6a9153d.tar.gz -48dd5030f9cfc2e0080d44c05e1a9a9c dfhack-df-structures-c3025fe.tar.gz -0213c359c4037086fd9f7fd1d8dc172e dfhack-scripts-0b6e4a5.tar.gz -c9db88e85386eb796a93a6c4e31b78a2 dfhack-stonesense-164d2cd.tar.gz +e0294082f4238a1a5bb38a8524bbb6d6 dfhack-0.44.12-r1.tar.gz +e135ff67da74e32ea0ecb37387d7f41a dfhack-df-structures-23500e4.tar.gz +e43eda5bf91c3a8fe343be6a596c970e dfhack-jsoncpp-ddabf50.tar.gz +eb426fb5029802d3b35f90a2a20644d2 dfhack-scripts-4a1953f.tar.gz +9f94b392ac44523d435d973c496f12af dfhack-stonesense-4a1953f.tar.gz