[firebird-emu] Update to latest upstream release.
by Ben Rosser
commit f04aa85e1468e8674a27cf973f623b3c36965705
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Apr 20 20:19:32 2020 -0400
Update to latest upstream release.
.gitignore | 2 ++
firebird-emu.spec | 15 +++++++++------
sources | 4 ++--
3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6799679..4df8bc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/firebird-1.4.tar.gz
/gif-h-8cb648f.tar.gz
+/firebird-1.5.tar.gz
+*.src.rpm
diff --git a/firebird-emu.spec b/firebird-emu.spec
index 803f856..d236eda 100644
--- a/firebird-emu.spec
+++ b/firebird-emu.spec
@@ -2,8 +2,8 @@
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
Name: firebird-emu
-Version: 1.4
-Release: 5%{?dist}
+Version: 1.5
+Release: 1%{?dist}
Summary: Third-party emulator for ARM-based TI calculators
License: GPLv3 and Public Domain
@@ -41,7 +41,7 @@ Android, iOS, Linux, Mac and Windows.
%autosetup -n firebird-%{version}
# Fix up desktop file.
-sed 's/DesktopUtility/X-DesktopUtility/g' -i resources/org.firebird.firebird-emu.desktop
+sed 's/DesktopUtility/X-DesktopUtility/g' -i resources/org.firebird-emus.firebird-emu.desktop
# Install gif-h submodule from source1 tarball.
cd core/
@@ -57,17 +57,20 @@ mv gif-h-%{commit1} gif-h
%make_install INSTALL_ROOT=%{buildroot}
# Validate desktop file.
-desktop-file-validate %{buildroot}/%{_datadir}/applications/org.firebird.firebird-emu.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/org.firebird-emus.firebird-emu.desktop
%files
%license LICENSE
%doc README.md TODO.md
%{_bindir}/firebird-emu
%{_bindir}/firebird-send
-%{_datadir}/applications/org.firebird.firebird-emu.desktop
-%{_datadir}/icons/hicolor/*/apps/firebird.png
+%{_datadir}/applications/org.firebird-emus.firebird-emu.desktop
+%{_datadir}/icons/hicolor/*/apps/org.firebird-emus.firebird-emu.png
%changelog
+* Tue Apr 21 2020 Ben Rosser <rosser.bjr(a)gmail.com> - 1.5-1
+- Updated to latest upstream release.
+
* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index ffd1bd5..7c08109 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-6e93f4d933991010677e7a88aab1caf7 firebird-1.4.tar.gz
-08f1ce41877da480875b4f10552a9bc5 gif-h-8cb648f.tar.gz
+SHA512 (firebird-1.5.tar.gz) = 3d976d06ef2416c981a75216a3c1746360a89ccaf1945598a2fc0e7c07a073261ac5fc2f5298af57ce1468737b84aea922fa30da9699dcc3770967b2a22fd343
+SHA512 (gif-h-8cb648f.tar.gz) = 8fb72d3cf9738c4758f79f6f69cf1c363c6ba5847f8f965003e541684dcdc453be53de6e1105b3feb982254b1dcb0a6ecf1a4a9bac4136a8e890c241e774ae38
4 years, 7 months
[dfhack/f32] perl-File-Copy only exists in Fedora 33+.
by Ben Rosser
commit e0c6d49d1b5ba0c52c9901d530e6a42d860de555
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Apr 20 20:13:35 2020 -0400
perl-File-Copy only exists in Fedora 33+.
dfhack.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/dfhack.spec b/dfhack.spec
index fede923..3b34874 100644
--- a/dfhack.spec
+++ b/dfhack.spec
@@ -94,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, perl-File-Copy
+BuildRequires: perl-XML-LibXML, perl-XML-LibXSLT, perl-Digest-SHA
BuildRequires: gcc-c++
# I think this is necessary now, otherwise the build fails.
4 years, 7 months
[dfhack/f32] (2 commits) ...Update sources file.
by Ben Rosser
Summary of changes:
f5555ec... Update to release with 0.47.04 support. (*)
dc5005d... Update sources file. (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 7 months
[dwarftherapist] Update to 41.1.6 with support for df 0.47.04.
by Ben Rosser
commit e58361eb7e909fc06eac9b065249b033a611c1a8
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Apr 20 20:08:38 2020 -0400
Update to 41.1.6 with support for df 0.47.04.
.gitignore | 1 +
dwarftherapist.spec | 5 ++++-
sources | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/.gitignore b/.gitignore
index 7c10f9d..d0d97e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/dwarftherapist-41.0.2.tar.gz
/dwarftherapist-41.0.3.tar.gz
/dwarftherapist-41.1.4.tar.gz
+/dwarftherapist-41.1.6.tar.gz
diff --git a/dwarftherapist.spec b/dwarftherapist.spec
index 90230f6..10db0ab 100644
--- a/dwarftherapist.spec
+++ b/dwarftherapist.spec
@@ -1,5 +1,5 @@
Name: dwarftherapist
-Version: 41.1.4
+Version: 41.1.6
Release: 1%{?dist}
Summary: Management tool designed to run side-by-side with Dwarf Fortress
@@ -110,6 +110,9 @@ sudo setcap cap_sys_ptrace=eip %{_bindir}/dwarftherapist
%license LICENSE.txt
%changelog
+* Mon Apr 20 2020 Ben Rosser <rosser.bjr(a)gmail.com> - 41.1.6-1
+- Update to latest upstream release.
+
* Fri Feb 28 2020 Ben Rosser <rosser.bjr(a)gmail.com> - 41.1.4-1
- Updated to latest upstream release for df 0.47.03
diff --git a/sources b/sources
index ef21c1a..3facd25 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (dwarftherapist-41.1.4.tar.gz) = 9e6d2f672ff4192cc2ab638c68ef29f87368a537429acf5d07a0be65595bf1253fc2a8678ac6864448b0d66d2e60a81a7cdb5c714956a705775ee8cf86e1e6df
+SHA512 (dwarftherapist-41.1.6.tar.gz) = 4ddb1362956006ddbdb9d310023f25fbb19f22a68e88ed3b7bf9b4f8aecaaf150a02c4f99ee79d20b24c93f6f9873d6684f116ab3ce43fdec46fe277a0a367fc
4 years, 7 months
[dfhack] Update sources file.
by Ben Rosser
commit dc5005dd778a67eb0c69719b28bd4838fee0cbe7
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Mon Apr 20 20:06:32 2020 -0400
Update sources file.
.gitignore | 6 ++++++
sources | 12 ++++++------
2 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ecefd72..395ea04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,9 @@
/dfhack-df-structures-018558e.tar.gz
/dfhack-scripts-4fdb2be.tar.gz
/dfhack-stonesense-4fdb2be.tar.gz
+/dfhack-0.47.04-beta1.tar.gz
+/dfhack-clsocket-8340c07.tar.gz
+/dfhack-df-structures-d51a1c4.tar.gz
+/dfhack-isoworld-e3c49ab.tar.gz
+/dfhack-scripts-b9fc288.tar.gz
+/dfhack-stonesense-b9fc288.tar.gz
diff --git a/sources b/sources
index d58cae1..d86e883 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,7 @@
-SHA512 (dfhack-0.47.03-alpha0.tar.gz) = ec76320184459956778af0233c3608d9c56d71a6fb3df81071a699c83951c4ee828ee832179efb3fbf4e2a4edec71812adfe5773a09f4a4ee756e5f8bb00dbc0
-SHA512 (dfhack-clsocket-6a9153d.tar.gz) = f72e169065f72d0a5c258fd57a82ddfa7b86723264af7488ba7018638462dc6bdf1a03f1d069002a0f83ec0d0d1f6a46ddf6ba2e11631f8d08f27494af892261
-SHA512 (dfhack-df-structures-018558e.tar.gz) = fdd079d3dd62a4ad1a1ce234a16db03f25d725851130bb7d73bafad36f5c54af1603dd7655ba7f1032c20ff5f58d17f22c70aeac46a24b9185668130f2a9bdec
-SHA512 (dfhack-isoworld-fbbf9e4.tar.gz) = 7ea7a80b5cbcea14305d46b305ecdbba00095fe7cbd5ac143e710137d50bc7451df80d09a506c94324dfc343ecb693d5bbdc34cc65e3eb57f7a783561be65ee6
SHA512 (dfhack-jsoncpp-ddabf50.tar.gz) = 5a85cf5f71c72bac5e229fdeeb1f7350bf57928d7e3dc688a0ffd41e6341070b53e53ef94875a8a01b3aa498000a5881644d5c5aa7c02322520db89a81d6aed3
-SHA512 (dfhack-scripts-4fdb2be.tar.gz) = 7c6c73a4617e1b1a7ef59d68df1b20712a03b800a37eb51fd5fb223638c3698cdcaf034cbdf68f15ed4d5a8be22659d76fc6dd6fed80117feb215c4c55bfd9ef
-SHA512 (dfhack-stonesense-4fdb2be.tar.gz) = 41d6e8fccfc49720b0b012628eca980cbbfc607b6e53d8edb17e2caa3b01dc818b537184347ea5591a2e45ff34e98cba870ea4cda96970f1b7f1121ac1861bf8
+SHA512 (dfhack-0.47.04-beta1.tar.gz) = 9e15ffc7b7a8d7514f5fa30eacc97c2c9899e12bbe2444970bedddfd9e81ace3b696f0b6569a3e092e8a1fe336f15330fd9a225065aa5b40426543b2270866b8
+SHA512 (dfhack-clsocket-8340c07.tar.gz) = 72c58f73d609152c2ee5571c100820f25ee2a253148d8fa2e0f8bf87fa70b658b0a71549ec914e30867e8d1b44994fa63ef0ed959fa67e73da770772d2182b86
+SHA512 (dfhack-df-structures-d51a1c4.tar.gz) = 53e755aecba66abc9ab015cafec396369f2aa6e147726ee3eb642d188e989347a2f64bdae4a8c8ba2a0e7871c17a46cc089b81b92db0a3a194e7cb7dcbdcec42
+SHA512 (dfhack-isoworld-e3c49ab.tar.gz) = 69ab89bc25140596f7abeb71a3a32634a088704cdd3c7a2386fe895fd3f8cd155cd1cfeede6e667eb271cb5df637df493f8dd3f721f7216089db2212f07254b8
+SHA512 (dfhack-scripts-b9fc288.tar.gz) = 8f12bfa22ae440bce33d47f1aa92441aa2324898b4cbd5aa2507442fd1c24846d32954ec9dab3bc324f50a046b9ac9a18436e91e91e067ce4557df1204703df9
+SHA512 (dfhack-stonesense-b9fc288.tar.gz) = e3b37d9f45cffef11dddd707157ea558833b8745cc71c6453fe96a3e1c9cfff8477f2170eb8f425d42866955425ddea92f3c58144fa1dc208fdd46afa8425136
4 years, 7 months
[dfhack] Update to release with 0.47.04 support.
by Ben Rosser
commit f5555ecfae62e7856a20daebf15ae84fc8d8a201
Author: Ben Rosser <rosser.bjr(a)gmail.com>
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> - 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> - 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 ""
4 years, 7 months