From c5ca7fe157c3cdbe08d1b41cf429ee7f3ac6e16a Mon Sep 17 00:00:00 2001 From: Giovanni Mariani Date: Thu, 15 Apr 2021 17:10:42 +0200 Subject: [PATCH] Updated to release 0.9.2 (bumping epoch because the old version number was 20150413), udpated S4 and BReqs --- .abf.yml | 3 ++- fheroes2.desktop | 2 +- fheroes2.spec | 43 ++++++++++++++++++++++--------------------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/.abf.yml b/.abf.yml index cbf5e98..bab83c1 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,3 @@ sources: - fheroes2-src-r3277.tar.bz2: e744d471597170b50b8105ee5292bec05c7475cf + fheroes2-0.9.2.tar.gz: e74bdfea2b7e093a86595b3884fa74950fecb6c0 + fheroes2.png: 29369e838940593d9fe23321903f40d58f4f1d6c diff --git a/fheroes2.desktop b/fheroes2.desktop index 586a0c9..a326ccd 100644 --- a/fheroes2.desktop +++ b/fheroes2.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=Free Heroes 2 Comment=Heroes Of Might And Magic 2 Engine -Exec=/usr/games/fheroes2 +Exec=fheroes2 Icon=fheroes2 StartupNotify=true Terminal=false diff --git a/fheroes2.spec b/fheroes2.spec index 56cea2c..4ac90f9 100644 --- a/fheroes2.spec +++ b/fheroes2.spec @@ -1,24 +1,23 @@ -%define rev r3277 - Summary: Free implementation of Heroes of the Might and Magic II engine Name: fheroes2 -Version: 20150413 -Release: 2 +Epoch: 1 +Version: 0.9.2 +Release: 1 License: GPLv2+ Group: Games/Strategy -Url: http://sourceforge.net/projects/fheroes2/ -Source0: %{name}-src-%{rev}.tar.bz2 +Url: https://ihhub.github.io/fheroes2/ +Source0: https://github.com/ihhub/fheroes2/archive/refs/tags/%{name}-%{version}.tar.gz Source2: fheroes2.sh Source3: fheroes2.png Source4: fheroes2.desktop Source5: fheroes2.cfg BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(sdl) -BuildRequires: pkgconfig(SDL_image) -BuildRequires: pkgconfig(SDL_mixer) -BuildRequires: pkgconfig(SDL_net) -BuildRequires: pkgconfig(SDL_ttf) +BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(SDL2_image) +BuildRequires: pkgconfig(SDL2_mixer) +BuildRequires: pkgconfig(SDL2_net) +BuildRequires: pkgconfig(SDL2_ttf) BuildRequires: pkgconfig(zlib) %description @@ -27,35 +26,37 @@ You need to copy files from data and maps directories from original game into your /usr/share/games/fheroes2/{maps,data} directories respectively. %files -%doc AUTHORS changelog.txt COPYING LICENSE README +%doc changelog.txt LICENSE README.md %{_gamesbindir}/* +%{_gamesdatadir}/%{name} %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/%{name}.desktop -%{_gamesdatadir}/%{name} #---------------------------------------------------------------------------- %prep -%setup -qn %{name}-src-%{rev}/fheroes2 +%setup -q + %build -cd src %setup_compile_flags %make \ WITH_AI=simple \ + WITH_SDL2="ON" \ CONFIGURE_FHEROES2_DATA="%{_gamesdatadir}/%{name}/" + %install -# let's create directory structure... +# No automated install: +# 1) Create directory structure mkdir -p %{buildroot}%{_gamesbindir} +mkdir -p %{buildroot}%{_gamesdatadir}/%{name}/{data,maps} mkdir -p %{buildroot}%{_datadir}/applications mkdir -p %{buildroot}%{_datadir}/pixmaps -mkdir -p %{buildroot}%{_gamesdatadir}/%{name}/{data,maps} -# and install what we need where we need it to be... -install -pm755 src/dist/%{name} %{buildroot}%{_gamesbindir}/%{name}.bin -install -pm755 %{SOURCE2} %{buildroot}%{_gamesbindir}/%{name} -install -pm 644 %{name}.cfg %{buildroot}%{_gamesdatadir}/%{name}/ +# 2) install what we need where we need +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