3:51 a.m.
commit 9a162ff40913f55758087fed2cfcbbd5d95d9240
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Jan 7 22:51:53 2019 -0500
Update dfhack to release r2 for 0.44.12.
.gitignore | 4 ++++
dfhack.spec | 17 ++++++++++-------
git-describe.h | 8 ++++----
sources | 8 ++++----
4 files changed, 22 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 30e2d80..25bb8bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,7 @@
/dfhack-jsoncpp-ddabf50.tar.gz
/dfhack-scripts-4a1953f.tar.gz
/dfhack-stonesense-4a1953f.tar.gz
+/dfhack-0.44.12-r2.tar.gz
+/dfhack-df-structures-4421583.tar.gz
+/dfhack-scripts-4a0f63e.tar.gz
+/dfhack-stonesense-4a0f63e.tar.gz
diff --git a/dfhack.spec b/dfhack.spec
index ad3c976..e79c070 100644
--- a/dfhack.spec
+++ b/dfhack.spec
@@ -10,13 +10,13 @@
# dfhack submodule: depends/jsoncpp-sub
%global commit11 ddabf50f72cf369bf652a95c4d9fe31a1865a781
# dfhack submodule: library/xml
-%global commit12 23500e4e9bd1885365d0a2ef1746c321c1dd5094
+%global commit12 44215836d5b57c3722b126aaf481f652385f3a23
# dfhack submodule: plugins/isoworld
%global commit13 fbbf9e46458e41707c27f2a4438452a579490db1
# dfhack submodule: plugins/stonesense
-%global commit14 4a1953f27c6acd1ceeb2d5447613c106e708c26c
+%global commit14 4a0f63e044d02532c948d67780dfd128fbd6d043
# dfhack submodule: scripts
-%global commit15 66b39d888e5f2d4f5c194ece08ba62ac7f110478
+%global commit15 a242a7cd81ae7046146f86c3103360449e1d9ca8
# End autogenerated commit lines.
@@ -30,7 +30,7 @@
# dfhack version string.
%global dfversion 0.44.12
-%global hackrelease r1
+%global hackrelease r2
# Define dfhack build architecture.
%global dfhack_arch 32
@@ -40,7 +40,7 @@
Name: dfhack
Version: %{dfversion}
-Release: 0.%{hackrelease}%{?dist}.1
+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.
@@ -330,7 +330,10 @@ rm -f docs/build.sh
%license LICENSE.rst
%changelog
-* Sat Dec 01 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.12-0.r1.1
+* Tue Jan 08 2019 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.12-2.r2
+- Updated to latest upstream release for 0.44.12.
+
+* Sat Dec 01 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.12-1.r1
- Updated to latest upstream release for 0.44.12.
- Add new submodule for jsoncpp.
@@ -340,7 +343,7 @@ rm -f docs/build.sh
* Fri Jul 27 2018 RPM Fusion Release Engineering <sergio(a)serjux.com> -
0.44.10-2.r1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-* Mon Jun 04 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.10-0.r1.1
+* Mon Jun 04 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.10-1.r1
- Updated to latest upstream release for 0.44.10.
* Mon Apr 09 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 0.44.09-1.r1
diff --git a/git-describe.h b/git-describe.h
index 96de0e5..5a1be70 100644
--- a/git-describe.h
+++ b/git-describe.h
@@ -1,6 +1,6 @@
-#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_DESCRIPTION "0.44.12-r2-0-g315852a2"
+#define DFHACK_GIT_COMMIT "315852a2513679ca1afe0d53b34974cefd946f89"
+#define DFHACK_GIT_XML_EXPECTED_COMMIT
"44215836d5b57c3722b126aaf481f652385f3a23"
+#define DFHACK_GIT_XML_COMMIT "44215836d5b57c3722b126aaf481f652385f3a23"
#define DFHACK_GIT_XML_MATCH
#define DFHACK_BUILD_ID ""
diff --git a/sources b/sources
index 4169cb2..65aa99b 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,7 @@
35cfdf121436218c1cd9d317c7599bc5 dfhack-isoworld-fbbf9e4.tar.gz
cd8054e0be8c44c5b03555471a91f78a dfhack-clsocket-6a9153d.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
+589f12861db5630c1570b1ab3137d858 dfhack-0.44.12-r2.tar.gz
+08906486d402c9c2b6fbbbffe76d914c dfhack-df-structures-4421583.tar.gz
+8e3adba214bc25779ab079f6c25c84d3 dfhack-scripts-4a0f63e.tar.gz
+dc20471cb0974bd74bcdaa0fddfdbcb6 dfhack-stonesense-4a0f63e.tar.gz