commit 5baf5d01b1938f325091b74407b985242a0071bc Author: Ben Rosser <rosser.bjr(a)gmail.com&gt; Date: Thu Jun 18 16:52:04 2020 -0400 Update to dfhack 0.47.04-r1. .gitignore | 2 ++ dfhack.spec | 11 +++++++---- git-describe.h | 8 ++++---- sources | 8 ++++---- 4 files changed, 17 insertions(+), 12 deletions(-) --- diff --git a/.gitignore b/.gitignore index 395ea04..10f199e 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /dfhack-isoworld-e3c49ab.tar.gz /dfhack-scripts-b9fc288.tar.gz /dfhack-stonesense-b9fc288.tar.gz +/dfhack-0.47.04-r1.tar.gz +/dfhack-df-structures-0792fc0.tar.gz diff --git a/dfhack.spec b/dfhack.spec index fede923..ab12ec9 100644 --- a/dfhack.spec +++ b/dfhack.spec @@ -10,7 +10,7 @@ # dfhack submodule: depends/jsoncpp-sub %global commit11 ddabf50f72cf369bf652a95c4d9fe31a1865a781 # dfhack submodule: library/xml -%global commit12 d51a1c4ca36731db62517b699fddd2c011e6bc99 +%global commit12 0792fc0202fb6a04bfdaa262bc36a3b14c8581e5 # dfhack submodule: plugins/isoworld %global commit13 e3c49ab017da2dcbeaadccd10e56d07d8f03b4ca # dfhack submodule: plugins/isoworld/agui @@ -20,7 +20,7 @@ # dfhack submodule: plugins/stonesense %global commit14 b9fc28836f34f7ce1be64de94afd90184a341c7d # dfhack submodule: scripts -%global commit15 e336520c09dbcd55bb9f7b3ca837d102a9026acf +%global commit15 2079b9fb69b8b4db48aa35ec54a96f5cca7cc8ef # End autogenerated commit lines. @@ -34,7 +34,7 @@ # dfhack version string. %global dfversion 0.47.04 -%global hackrelease beta1 +%global hackrelease r1 # Define dfhack build architecture. %global dfhack_arch 32 @@ -44,7 +44,7 @@ Name: dfhack Version: %{dfversion} -Release: 1.%{hackrelease}%{?dist} +Release: 2.%{hackrelease}%{?dist} 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. @@ -341,6 +341,9 @@ rm -f docs/build.sh %license LICENSE.rst %changelog +* Thu Jun 18 2020 Ben Rosser <rosser.bjr(a)gmail.com&gt; - 0.47.04-2.r1 +- Update to stable release with support for 0.47.04. + * 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. diff --git a/git-describe.h b/git-describe.h index 5ada5ac..da75518 100644 --- a/git-describe.h +++ b/git-describe.h @@ -1,6 +1,6 @@ -#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_DESCRIPTION "0.47.04-r1-0-g6bdbf5b0" +#define DFHACK_GIT_COMMIT "6bdbf5b0ddaa045a8fc6ff91e91dc30cb3d21e3f" +#define DFHACK_GIT_XML_EXPECTED_COMMIT "0792fc0202fb6a04bfdaa262bc36a3b14c8581e5" +#define DFHACK_GIT_XML_COMMIT "0792fc0202fb6a04bfdaa262bc36a3b14c8581e5" #define DFHACK_GIT_XML_MATCH #define DFHACK_BUILD_ID "" diff --git a/sources b/sources index d86e883..09a90fc 100644 --- a/sources +++ b/sources @@ -1,7 +1,7 @@ -SHA512 (dfhack-jsoncpp-ddabf50.tar.gz) = 5a85cf5f71c72bac5e229fdeeb1f7350bf57928d7e3dc688a0ffd41e6341070b53e53ef94875a8a01b3aa498000a5881644d5c5aa7c02322520db89a81d6aed3 -SHA512 (dfhack-0.47.04-beta1.tar.gz) = 9e15ffc7b7a8d7514f5fa30eacc97c2c9899e12bbe2444970bedddfd9e81ace3b696f0b6569a3e092e8a1fe336f15330fd9a225065aa5b40426543b2270866b8 +SHA512 (dfhack-0.47.04-r1.tar.gz) = dda9a700449aadcc7742e2ec7f025b20c756069327ed38f49ee552cb8bbf86b39355736ce7592e3cc7310c0085c955c6af3b9e7ea3c4449bda9dab24ab4b07eb SHA512 (dfhack-clsocket-8340c07.tar.gz) = 72c58f73d609152c2ee5571c100820f25ee2a253148d8fa2e0f8bf87fa70b658b0a71549ec914e30867e8d1b44994fa63ef0ed959fa67e73da770772d2182b86 -SHA512 (dfhack-df-structures-d51a1c4.tar.gz) = 53e755aecba66abc9ab015cafec396369f2aa6e147726ee3eb642d188e989347a2f64bdae4a8c8ba2a0e7871c17a46cc089b81b92db0a3a194e7cb7dcbdcec42 +SHA512 (dfhack-df-structures-0792fc0.tar.gz) = e104b01c8ce5341f34719b014e6474981da226e179d78a15c215ee190aa8c05c163fa20287161b92b8b851b11e3ebe76f9770c98be59df81c411bf377c4315b8 SHA512 (dfhack-isoworld-e3c49ab.tar.gz) = 69ab89bc25140596f7abeb71a3a32634a088704cdd3c7a2386fe895fd3f8cd155cd1cfeede6e667eb271cb5df637df493f8dd3f721f7216089db2212f07254b8 -SHA512 (dfhack-scripts-b9fc288.tar.gz) = 8f12bfa22ae440bce33d47f1aa92441aa2324898b4cbd5aa2507442fd1c24846d32954ec9dab3bc324f50a046b9ac9a18436e91e91e067ce4557df1204703df9 +SHA512 (dfhack-jsoncpp-ddabf50.tar.gz) = 5a85cf5f71c72bac5e229fdeeb1f7350bf57928d7e3dc688a0ffd41e6341070b53e53ef94875a8a01b3aa498000a5881644d5c5aa7c02322520db89a81d6aed3 +SHA512 (dfhack-scripts-b9fc288.tar.gz) = 24f9f55d37bcda300a86f64352d8fc518581716fe720cefb8b77a33cfd60d4694ac5ae72c0aa1e51b7fa18015d6b47e394af2ce6fec2b41a4017623a512853b7 SHA512 (dfhack-stonesense-b9fc288.tar.gz) = e3b37d9f45cffef11dddd707157ea558833b8745cc71c6453fe96a3e1c9cfff8477f2170eb8f425d42866955425ddea92f3c58144fa1dc208fdd46afa8425136