commit c5cccc3c517c34b7286ed4dbac7d2da4982012b9 Author: Ben Rosser <rosser.bjr(a)gmail.com&gt; Date: Mon Feb 26 11:37:40 2018 -0500 Update to 0.44.05-r2. .gitignore | 5 +++++ dfhack.spec | 13 ++++++++----- git-describe.h | 8 ++++---- sources | 8 ++++---- 4 files changed, 21 insertions(+), 13 deletions(-) --- diff --git a/.gitignore b/.gitignore index bba1d9b..69f2716 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,11 @@ +*.rpm /dfhack-0.44.05-r1.tar.gz /dfhack-clsocket-0f0ad78.tar.gz /dfhack-df-structures-40da723.tar.gz /dfhack-isoworld-3ff3f05.tar.gz /dfhack-scripts-8d079a5.tar.gz /dfhack-stonesense-455b51a.tar.gz +/dfhack-0.44.05-r2.tar.gz +/dfhack-df-structures-2794f8a.tar.gz +/dfhack-scripts-9d8f209.tar.gz +/dfhack-stonesense-031bf4c.tar.gz diff --git a/dfhack.spec b/dfhack.spec index bc5a6f1..5e52d14 100644 --- a/dfhack.spec +++ b/dfhack.spec @@ -8,13 +8,13 @@ # dfhack submodule: depends/clsocket %global commit10 0f0ad78c4fd429caacd0694b5c868dbeacea16b6 # dfhack submodule: library/xml -%global commit11 40da7231a0114fe3420d475961b08826f64fbf79 +%global commit11 2794f8a6d7405d4858bac486a0bb17b94740c142 # dfhack submodule: plugins/isoworld %global commit12 3ff3f05da53077dd9e67c1eef672427a2bfd95ea # dfhack submodule: plugins/stonesense -%global commit13 455b51aab7a93095a775285782635cfc17ac651a +%global commit13 031bf4caafec321dd315202a83539d052ed49d84 # dfhack submodule: scripts -%global commit14 8d079a59122d9ba72ce9c0f7687402a343d09bc7 +%global commit14 9d8f2096fc4c247299cbc94c6a8d756f31690a4b # End autogenerated commit lines. @@ -27,7 +27,7 @@ # dfhack version string. %global dfversion 0.44.05 -%global hackrelease r1 +%global hackrelease r2 # Define dfhack build architecture. %global dfhack_arch 32 @@ -37,7 +37,7 @@ Name: dfhack Version: %{dfversion} -Release: 2.%{hackrelease}%{?dist} +Release: 3.%{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. @@ -321,6 +321,9 @@ rm -f docs/build.sh %license LICENSE.rst %changelog +* Mon Feb 26 2018 Ben Rosser <rosser.bjr(a)gmail.com&gt; - 0.44.05-3.r2 +- Update to latest upstream release for 0.44.05. + * Wed Feb 21 2018 Ben Rosser <rosser.bjr(a)gmail.com&gt; - 0.44.05-2.r1 - Added missing provides for dfhack-static to dfhack-devel. diff --git a/git-describe.h b/git-describe.h index de4b0fb..b7f9c26 100644 --- a/git-describe.h +++ b/git-describe.h @@ -1,5 +1,5 @@ -#define DFHACK_GIT_DESCRIPTION "0.44.05-r1-0-gc92227f0" -#define DFHACK_GIT_COMMIT "c92227f007114148f0b48059908b86645a6c36d7" -#define DFHACK_GIT_XML_EXPECTED_COMMIT "40da7231a0114fe3420d475961b08826f64fbf79" -#define DFHACK_GIT_XML_COMMIT "40da7231a0114fe3420d475961b08826f64fbf79" +#define DFHACK_GIT_DESCRIPTION "0.44.05-r2-0-g0e7ab278" +#define DFHACK_GIT_COMMIT "0e7ab27850821993ebc317bed9dc0135f030a3e5" +#define DFHACK_GIT_XML_EXPECTED_COMMIT "2794f8a6d7405d4858bac486a0bb17b94740c142" +#define DFHACK_GIT_XML_COMMIT "2794f8a6d7405d4858bac486a0bb17b94740c142" #define DFHACK_GIT_XML_MATCH diff --git a/sources b/sources index 2905517..0c65101 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -a5caf80229e67fb88096975e8a858a0e dfhack-0.44.05-r1.tar.gz +28d215fc6ff45db4e87bee26e33fb39f dfhack-df-structures-2794f8a.tar.gz +517725c664bb1ca0c4e314ac27667d15 dfhack-scripts-9d8f209.tar.gz +16c76bbc022f2e674c655a715900a56c dfhack-stonesense-031bf4c.tar.gz b16252960c7de5dfa6a580cbd6a32dbd dfhack-clsocket-0f0ad78.tar.gz -cb37d829a73fbdbe6656dfdef8814b1f dfhack-df-structures-40da723.tar.gz 5c5a2bd6b863de63d7d1dcb4cf3c1176 dfhack-isoworld-3ff3f05.tar.gz -cc008e1113678d1893ec3df441e6b199 dfhack-scripts-8d079a5.tar.gz -aa48d3b86648b7d024bec20b8ec1f1a6 dfhack-stonesense-455b51a.tar.gz +88d8925b5e701654284b77c91c561679 dfhack-0.44.05-r2.tar.gz