commit b2e520cec224009fd30db94f27d2636fb42b3f04 Author: Trung Lê <8(a)tle.id.au&gt; Date: Mon May 27 21:50:48 2024 +1000 Disable Innoextract build sources | 1 - vcmi.spec | 14 ++++---------- 2 files changed, 4 insertions(+), 11 deletions(-) --- diff --git a/sources b/sources index cce178e..5f8cf32 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (vcmi-1.5.1.tar.gz) = 840bd3c79c2d1b25bb30e2630812cd0f99b956f15b579eb6377ba8be80d49cbb0c2566c80b462064022f63799133bdfcb2a141252bcd663f1cbee8d9d99bdb5d SHA512 (fuzzylite-7aee562.tar.gz) = f7ef98b28c52ff7e793ca21d532f49fc547bae882ab77ed72fd4b43e80805d738c829be11e13a4f71c74166a0c4e54936a79d3f89ae68edced3cf39dc37c5be5 -SHA512 (innoextract-9977089.tar.gz) = d78d70268afcc99badc62e1ac53f7c90add2af8818c34685e6ae505af8c4141024050fc6c861972cb51a696b62e9d368b77572b3c58ec8eddd1d04d5153a010e diff --git a/vcmi.spec b/vcmi.spec index ac69c0b..4a68d1d 100644 --- a/vcmi.spec +++ b/vcmi.spec @@ -6,19 +6,14 @@ URL: https://vcmi.eu/ %global fuzzylite_scommit %(c=%{fuzzylite_commit}; echo ${c:0:7}) %global fuzzylite_version 6.0 -%global innoextract_commit 9977089412ebafe9f79936aa65a2edf16a84ae3e -%global innoextract_scommit %(c=%{innoextract_commit}; echo ${c:0:7}) -%global innoextract_version 1.9 - Version: 1.5.1 -Release: 0%{?dist} +Release: 1%{?dist} # vcmi is GPLv2+, fyzzylight is GPLv3 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... -Source2: https://github.com/vcmi/innoextract/archive/%{innoextract_commit}/innoext... Patch0: fix_ffmpeg_suffix.patch @@ -56,6 +51,7 @@ BuildRequires: qt5-qtbase-devel BuildRequires: qt5-linguist %endif +Requires: innoextract Requires: hicolor-icon-theme Requires: %{name}-data = %{version}-%{release} Provides: bundled(fuzzylight) = %{fuzzylite_version} @@ -84,9 +80,6 @@ Data files for the VCMI project, a %{summary}. # fuzzyight from Source1: tar -xf %{SOURCE1} -C AI/FuzzyLite --strip-components=1 -# innoextract from Source2: -tar -xf %{SOURCE2} -C launcher/lib/innoextract --strip-components=1 - dos2unix license.txt ChangeLog.md # Don't show GITDIR-NOTFOUND in the window title @@ -99,7 +92,8 @@ sed -i 's/GITDIR-NOTFOUND/%{version}/' cmake_modules/* -DENABLE_TEST=0 \ -UCMAKE_INSTALL_LIBDIR \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \ - -DCMAKE_INSTALL_RPATH=%{_libdir}/%{name} + -DCMAKE_INSTALL_RPATH=%{_libdir}/%{name} \ + -DENABLE_INNOEXTRACT='FALSE' %ifnarch %{ix86} x86_64 aarch64 # not enough memory in Koji for parallel build