Merge from rosa2016.1

This commit is contained in:
survolog (Andrey Grigorev) 2021-06-13 15:25:07 +03:00
commit d6279c7777
2 changed files with 27 additions and 20 deletions

View file

@ -1,3 +1,7 @@
sources: sources:
<<<<<<< HEAD
fheroes2-0.9.3.tar.gz: 20d41b651958f8225fe56dfc4a5bf100d13a8895 fheroes2-0.9.3.tar.gz: 20d41b651958f8225fe56dfc4a5bf100d13a8895
=======
fheroes2-0.9.4.tar.gz: 214c6818d6fa429b3873ebcc09f432b0485f778e
>>>>>>> rosa2016.1
fheroes2.png: 29369e838940593d9fe23321903f40d58f4f1d6c fheroes2.png: 29369e838940593d9fe23321903f40d58f4f1d6c

View file

@ -1,11 +1,12 @@
Summary: Free implementation of Heroes of the Might and Magic II engine Summary: Free implementation of Heroes of the Might and Magic II engine
Name: fheroes2 Name: fheroes2
Version: 0.9.3 Epoch: 1
Version: 0.9.4
Release: 1 Release: 1
License: GPLv2+ License: GPLv2+
Group: Games/Strategy Group: Games/Strategy
Url: https://github.com/inhub Url: https://ihhub.github.io/fheroes2/
Source0: https://github.com/ihhub/fheroes2/archive/%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/ihhub/fheroes2/archive/refs/tags/%{version}.tar.gz?/%{name}-%{version}.tar.gz
Source2: fheroes2.sh Source2: fheroes2.sh
Source3: fheroes2.png Source3: fheroes2.png
Source4: fheroes2.desktop Source4: fheroes2.desktop
@ -25,37 +26,39 @@ You need to copy files from data and maps directories from original game
into your /usr/share/games/fheroes2/{maps,data} directories respectively. into your /usr/share/games/fheroes2/{maps,data} directories respectively.
%files %files
%doc LICENSE %doc changelog.txt LICENSE README.md
%{_gamesbindir}/* %{_gamesbindir}/*
%{_gamesdatadir}/%{name}
%{_datadir}/pixmaps/%{name}.png %{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
%{_gamesdatadir}/%{name}
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
%prep %prep
%autosetup -p1 %setup -q
%build %build
%set_build_flags %setup_compile_flags
%make_build \ %make \
WITH_AI=simple \ WITH_AI=simple \
WITH_SDL2="ON" \ WITH_SDL2="ON" \
CONFIGURE_FHEROES2_DATA="%{_gamesdatadir}/%{name}/" CONFIGURE_FHEROES2_DATA="%{_gamesdatadir}/%{name}/"
%install %install
# let's create directory structure... # No automated install:
%__mkdir_p %{buildroot}%{_gamesbindir} # 1) Create directory structure
%__mkdir_p %{buildroot}%{_datadir}/applications mkdir -p %{buildroot}%{_gamesbindir}
%__mkdir_p %{buildroot}%{_datadir}/pixmaps mkdir -p %{buildroot}%{_gamesdatadir}/%{name}/{data,maps}
%__mkdir_p %{buildroot}%{_gamesdatadir}/%{name}/{data,maps} mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/pixmaps
# 2) install what we need where we need it
install -pm 755 src/dist/%{name} %{buildroot}%{_gamesbindir}/%{name}.bin
install -pm 755 %{SOURCE2} %{buildroot}%{_gamesbindir}/%{name}
install -pm 644 %{name}.key %{buildroot}%{_gamesdatadir}/%{name}/
install -pm 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -pm 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}.desktop
install -pm 644 %{SOURCE5} %{buildroot}%{_gamesdatadir}/%{name}/
# and install what we need where we need it to be...
%__install -pm755 %{name} %{buildroot}%{_gamesbindir}/%{name}.bin
%__install -pm755 %{SOURCE2} %{buildroot}%{_gamesbindir}/%{name}
%__install -pm 644 %{name}.key %{buildroot}%{_gamesdatadir}/%{name}/
%__install -pm 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/%{name}.png
%__install -pm 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}.desktop
%__install -pm 644 %{SOURCE5} %{buildroot}%{_gamesdatadir}/%{name}/