commit ea3c6e3f4ad9bafb6fcacaaa45f2ee032ec8ee39 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Sep 14 22:36:40 2022 +0100 New upstream release .gitignore | 1 + fix_ffmpeg_suffix.patch | 20 ++++++++++---------- sources | 4 ++-- vcmi.spec | 44 +++++++++++++++++++++----------------------- 4 files changed, 34 insertions(+), 35 deletions(-) --- diff --git a/.gitignore b/.gitignore index 6ed0011..e918956 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ results_vcmi/ /vcmi-*/ *.src.rpm +/vcmi.tar.gz diff --git a/fix_ffmpeg_suffix.patch b/fix_ffmpeg_suffix.patch index a8f076d..0181037 100644 --- a/fix_ffmpeg_suffix.patch +++ b/fix_ffmpeg_suffix.patch @@ -1,11 +1,11 @@ ---- a/cmake_modules/FindFFmpeg.cmake -+++ b/cmake_modules/FindFFmpeg.cmake -@@ -79,7 +79,7 @@ macro(find_component _component _pkgconf - ${PC_LIB${_component}_INCLUDEDIR} - ${PC_LIB${_component}_INCLUDE_DIRS} - PATH_SUFFIXES -- ffmpeg -+ compat-ffmpeg4 - ) +--- a/cmake_modules/Findffmpeg.cmake ++++ b/cmake_modules/Findffmpeg.cmake +@@ -73,6 +73,8 @@ function (_ffmpeg_find component headern + /opt/lib + /usr/freeware/lib64 + "${ffmpeg_ROOT}/bin" ++ PATH_SUFFIXES ++ ffmpeg + DOC "FFMPEG's ${component} library") + mark_as_advanced("ffmpeg_${component}_LIBRARY") - find_library(${_component}_LIBRARIES NAMES ${_library} diff --git a/sources b/sources index 736f1ec..590d947 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (vcmi-f06c8a8.tar.gz) = 9c646c30e4b670fc362b505bd06b90153383a9f160a43710e03776c55ad6c77de4b50d31dd80934f2176299899028e76ab50cce362c0a051bf370cec66cba287 +SHA512 (vcmi.tar.gz) = d0b6ce3e51bd7e45bfd98bf4edfb219b64fdbdc765926a1b7ca44455c68390b18f72e5f4f44daade50bdca228bbd5c4d2ef4ace296a3a6be9eb2a82aee169f85 SHA512 (fuzzylite-9751a75.tar.gz) = 0925487f00a0997b8ea9819a8d2f5161f797b3f3b2e69cc0859fd85d85859a013e5b6775e4a5bbf5ad5422f62139a592f03b885d567e3dcab69f7a6dab4fe9d7 -SHA512 (vcmi.zip) = f64966dfc1446fafa11870875a63a8bf48c2d8d80852ecf8337914a36fbc6061e21ffdbe9f0db872b442690c74e7c68f84ecc33d9de83246bed57b69f8cc0d71 +SHA512 (vcmi-1.0.0.tar.gz) = c88d307594dc73c2eb22b3c5237b9e37ea1e2f98cac2b10882a040a96fcf903ac6ec140f1cf031417c71c414e271a17d29409d4395402a669737573c6ee09ef0 diff --git a/vcmi.spec b/vcmi.spec index 6b915f9..7505e9a 100644 --- a/vcmi.spec +++ b/vcmi.spec @@ -2,31 +2,27 @@ Name: vcmi Summary: Heroes of Might and Magic 3 game engine URL: https://vcmi.eu/ -%global commit f06c8a872592bddfbe3fd5116979af0679f27bd3 -%global scommit %(c=%{commit}; echo ${c:0:7}) - %global fuzzylite_commit 9751a751a17c0682ed5d02e583c6a0cda8bc88e5 %global fuzzylite_scommit %(c=%{fuzzylite_commit}; echo ${c:0:7}) %global fuzzylite_version 6.0 -Version: 0.99^20190113git%{scommit} -Release: 7%{?dist} +Version: 1.0.0 +Release: 1%{?dist} # vcmi is GPLv2+, fyzzylight is GPLv3 License: GPLv2+ and GPLv3 -Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{scommit}.t... +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) -Source2: %{name}.zip +# unzip delete Maps and repack as tar.gz +Source2: %{name}.tar.gz -# Boost 1.71+ -Patch1: https://github.com/vcmi/vcmi/commit/ac81d0f.patch -Patch2: fix_ffmpeg_suffix.patch +Patch0: fix_ffmpeg_suffix.patch # The Koji builder gets killed here, but I don't expect people to use this there ExcludeArch: ppc64le @@ -47,9 +43,12 @@ BuildRequires: boost-system >= 1.51 BuildRequires: boost-thread >= 1.51 BuildRequires: boost-program-options >= 1.51 BuildRequires: boost-locale >= 1.51 +BuildRequires: libappstream-glib +BuildRequires: luajit-devel BuildRequires: minizip-devel +BuildRequires: tbb-devel BuildRequires: zlib-devel -BuildRequires: compat-ffmpeg4-devel +BuildRequires: ffmpeg-devel BuildRequires: qt5-qtbase-devel Requires: hicolor-icon-theme @@ -76,28 +75,23 @@ Data files for the VCMI project, a %{summary}. %prep -%setup -q -a1 -a2 -n %{name}-%{commit} +%autosetup -p1 # fuzzyight from Source1: -rmdir AI/FuzzyLite -mv fuzzylite-%{fuzzylite_commit} AI/FuzzyLite +tar -xf %{SOURCE1} -C AI/FuzzyLite --strip-components=1 # mods from Source2: -mv vcmi/Mods/* Mods && rm -rf vcmi +tar -xf %{SOURCE2} -C Mods --strip-components=2 dos2unix README.md license.txt AUTHORS ChangeLog -%patch1 -p1 -%patch2 -p1 - # Don't show GITDIR-NOTFOUND in the window title -sed -i 's/GITDIR-NOTFOUND/%{scommit}/' cmake_modules/* - +sed -i 's/GITDIR-NOTFOUND/%{version}/' cmake_modules/* %build # low effort fix of some cmake brokenness -export CXXFLAGS="%{build_cxxflags} -I/usr/include/compat-ffmpeg4" +export CXXFLAGS="%{build_cxxflags} -I/usr/include/ffmpeg" -%cmake \ +%cmake -Wno-dev \ -DENABLE_TEST=0 \ -UCMAKE_INSTALL_LIBDIR \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \ @@ -116,7 +110,7 @@ export CXXFLAGS="%{build_cxxflags} -I/usr/include/compat-ffmpeg4" %check desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop - +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/eu.vcmi.VCMI.metainfo.xml %ldconfig_scriptlets @@ -133,6 +127,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop # keep this in the main package, because GNOME Software etc. %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/vcmiclient.png +%{_metainfodir}/eu.vcmi.VCMI.metainfo.xml %files data @@ -141,6 +136,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %changelog +* Wed Sep 14 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.0.0-1 +- New upstream release + * Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 0.99^20190113gitf06c8a8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1