commit 58e22369ac1eff76c88c5f32d90338df905532b9
Author: Trung Lê <8(a)tle.id.au>
Date: Tue Aug 15 12:56:37 2023 +0100
New upstream release
ac81d0f.patch | 62 -----------------------------------------------------------
sources | 5 ++---
vcmi.spec | 32 +++++++++++++++---------------
3 files changed, 17 insertions(+), 82 deletions(-)
---
diff --git a/sources b/sources
index 590d947..65cfc40 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (vcmi.tar.gz) =
d0b6ce3e51bd7e45bfd98bf4edfb219b64fdbdc765926a1b7ca44455c68390b18f72e5f4f44daade50bdca228bbd5c4d2ef4ace296a3a6be9eb2a82aee169f85
-SHA512 (fuzzylite-9751a75.tar.gz) =
0925487f00a0997b8ea9819a8d2f5161f797b3f3b2e69cc0859fd85d85859a013e5b6775e4a5bbf5ad5422f62139a592f03b885d567e3dcab69f7a6dab4fe9d7
-SHA512 (vcmi-1.0.0.tar.gz) =
c88d307594dc73c2eb22b3c5237b9e37ea1e2f98cac2b10882a040a96fcf903ac6ec140f1cf031417c71c414e271a17d29409d4395402a669737573c6ee09ef0
+SHA512 (vcmi-1.3.0.tar.gz) =
a7fbbfcc37d850ab0f9334c0c514c28db4a3d74b2f1756b2665a2adc61e2260003057349146b84f17671fc445cdaafabfd5e8a84f070f12d04ba2476759e4e03
+SHA512 (fuzzylite-7aee562.tar.gz) =
f7ef98b28c52ff7e793ca21d532f49fc547bae882ab77ed72fd4b43e80805d738c829be11e13a4f71c74166a0c4e54936a79d3f89ae68edced3cf39dc37c5be5
diff --git a/vcmi.spec b/vcmi.spec
index ca9e588..db7012f 100644
--- a/vcmi.spec
+++ b/vcmi.spec
@@ -2,13 +2,13 @@ Name: vcmi
Summary: Heroes of Might and Magic 3 game engine
URL:
https://vcmi.eu/
-%global fuzzylite_commit 9751a751a17c0682ed5d02e583c6a0cda8bc88e5
+%global fuzzylite_commit 7aee562d6ca17f3cf42588ffb5116e03017c3c50
%global fuzzylite_scommit %(c=%{fuzzylite_commit}; echo ${c:0:7})
%global fuzzylite_version 6.0
-Version: 1.0.0
-Release: 4%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
# vcmi is GPLv2+, fyzzylight is GPLv3
License: GPLv2+ and GPLv3
@@ -16,12 +16,6 @@ License: GPLv2+ and GPLv3
Source0:
https://github.com/vcmi/vcmi/archive/refs/tags/%{version}/%{name}-%{versi...
Source1:
https://github.com/fuzzylite/fuzzylite/archive/%{fuzzylite_commit}/fuzzyl...
-# Enable extra resolutions
-#
https://forum.vcmi.eu/t/where-is-the-mod-for-resolutions-other-than-800x6...
-#
https://www.dropbox.com/sh/fwor43x5xrgzx6q/AABpTFqGK7Q9almbyr3hp9jma/mods... (not
directly downloadable)
-# unzip delete Maps and repack as tar.gz
-Source2: %{name}.tar.gz
-
Patch0: fix_ffmpeg_suffix.patch
# The Koji builder gets killed here, but I don't expect people to use this there
@@ -45,11 +39,12 @@ BuildRequires: boost-program-options >= 1.51
BuildRequires: boost-locale >= 1.51
BuildRequires: libappstream-glib
BuildRequires: luajit-devel
-BuildRequires: minizip-devel
+BuildRequires: minizip-ng-devel
BuildRequires: tbb-devel
BuildRequires: zlib-devel
BuildRequires: ffmpeg-devel
BuildRequires: qt5-qtbase-devel
+BuildRequires: qt5-linguist
Requires: hicolor-icon-theme
Requires: %{name}-data = %{version}-%{release}
@@ -79,19 +74,15 @@ Data files for the VCMI project, a %{summary}.
# fuzzyight from Source1:
tar -xf %{SOURCE1} -C AI/FuzzyLite --strip-components=1
-# mods from Source2:
-tar -xf %{SOURCE2} -C Mods --strip-components=2
-
-dos2unix README.md license.txt AUTHORS ChangeLog
+dos2unix README.md license.txt AUTHORS ChangeLog.md
# Don't show GITDIR-NOTFOUND in the window title
sed -i 's/GITDIR-NOTFOUND/%{version}/' cmake_modules/*
%build
-# low effort fix of some cmake brokenness
-export CXXFLAGS="%{build_cxxflags} -I/usr/include/ffmpeg"
%cmake -Wno-dev \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DENABLE_TEST=0 \
-UCMAKE_INSTALL_LIBDIR \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
@@ -116,8 +107,9 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%files
-%doc README.md AUTHORS ChangeLog
+%doc README.md AUTHORS ChangeLog.md
%license license.txt AI/FuzzyLite/LICENSE.FuzzyLite
+%{_bindir}/vcmieditor
%{_bindir}/vcmiclient
%{_bindir}/vcmiserver
%{_bindir}/vcmibuilder
@@ -127,6 +119,8 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
# keep this in the main package, because GNOME Software etc.
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/*/apps/vcmiclient.png
+%{_datadir}/icons/hicolor/*/apps/vcmiclient.svg
+%{_datadir}/icons/hicolor/*/apps/vcmieditor.png
%{_metainfodir}/eu.vcmi.VCMI.metainfo.xml
@@ -136,6 +130,10 @@ appstream-util validate-relax --nonet
%{buildroot}%{_metainfodir}/eu.vcmi.VCMI.m
%changelog
+* Mon Aug 14 2023 Trung Lê <8(a)tle.id.au> - 1.3.0-1
+- New upstream release
+- Clean up defunct codes
+
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
1.0.0-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild