From 9de62ebf40761326e52513514c384f52a6399fc7 Mon Sep 17 00:00:00 2001 From: Sergey Zhemoytel Date: Sat, 13 Jul 2024 14:02:58 +0000 Subject: [PATCH] 1.1.1 --- .abf.yml | 2 +- fheroes2.spec | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.abf.yml b/.abf.yml index 52b732a..92f7198 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,3 +1,3 @@ sources: - fheroes2-1.1.0.tar.gz: 07ea5253244b6660a52cea9c12ebbb648d449485 + fheroes2-1.1.1.tar.gz: d615af11e18575dd6fd3e1081261cfb4f8410a4a fheroes2.png: 29369e838940593d9fe23321903f40d58f4f1d6c diff --git a/fheroes2.spec b/fheroes2.spec index 78d863c..566875c 100644 --- a/fheroes2.spec +++ b/fheroes2.spec @@ -1,15 +1,16 @@ %global optflags %(echo %{optflags} | sed -e 's/-ffat-lto-objects//g' -e 's/-fvar-tracking-assignments//g' -e 's/-Wa,--compress-debug-sections//g' ) - +%define llvmver llvm17 +%define _llvmdir /opt/%{llvmver} Summary: Free implementation of Heroes of the Might and Magic II engine Name: fheroes2 Epoch: 1 -Version: 1.1.0 +Version: 1.1.1 Release: 1 License: GPLv2+ Group: Games/Strategy -URL: https://ihhub.github.io/fheroes2/ -Source0: https://github.com/ihhub/fheroes2/archive/refs/tags/%{version}.tar.gz?/%{name}-%{version}.tar.gz +URL: https://ihhub.github.io/fheroes2 +Source0: https://github.com/ihhub/fheroes2/archive/%{version}.tar.gz?/%{name}-%{version}.tar.gz Source1000: %{name}.rpmlintrc Source2: fheroes2.sh Source3: fheroes2.png @@ -24,8 +25,7 @@ BuildRequires: pkgconfig(SDL2_net) BuildRequires: pkgconfig(SDL2_ttf) BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(dbus-1) -BuildRequires: clang -BuildRequires: llvm +BuildRequires: %{llvmver} BuildRequires: cmake >= 3.20 BuildRequires: stdc++-gcc10-devel @@ -49,10 +49,11 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively. %setup -q %build -export CC=clang -export CXX=clang++ -export AR=llvm-ar -export NM=llvm-nm +export CC=%{_llvmdir}/bin/clang +export CXX=%{_llvmdir}/bin/clang++ +export AR=%{_llvmdir}/bin/llvm-ar +export NM=%{_llvmdir}/bin/llvm-nm +export LLD=%{_llmdir}/bin/lld export READELF=readelf export LDFLAGS="-lstdc++-gcc10"