diff --git a/.abf.yml b/.abf.yml index 0e060b4..baead5b 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "fheroes2-src-r2767.tgz": f68b709ef57c0095415278dd43669e0fc5447bbf + "fheroes2-src-r2931.tgz": 4c06f702c0ce5cf0823999b8c16e33d555f6c064 diff --git a/fheroes2.spec b/fheroes2.spec index 30995e3..693f0fc 100644 --- a/fheroes2.spec +++ b/fheroes2.spec @@ -1,7 +1,7 @@ -%define rev r2767 +%define rev r2931 Name: fheroes2 -Version: 20120301 -Release: %mkrel 1 +Version: 20120917 +Release: 1 Summary: Free implementation of Heroes of the Might and Magic II engine License: GPL Group: Games/Strategy @@ -16,8 +16,8 @@ BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: SDL_net-devel BuildRequires: SDL_ttf-devel -BuildRequires: freetype-devel -BuildRequires: png-devel +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(libpng) BuildRequires: zlib-devel %description @@ -32,27 +32,22 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively %make WITH_AI=simple CONFIGURE_FHEROES2_DATA="%{_gamesdatadir}/%{name}/" %install -%__rm -rf %{buildroot} # let's create directory structure... -%__mkdir_p %{buildroot}%{_gamesbindir} -%__mkdir_p %{buildroot}%{_datadir}/applications -%__mkdir_p %{buildroot}%{_datadir}/pixmaps -%__mkdir_p %{buildroot}%{_gamesdatadir}/%{name}/{data,maps} +mkdir -p %{buildroot}%{_gamesbindir} +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 %{name} %{buildroot}%{_gamesbindir}/%{name}.bin -%__install -pm755 %{SOURCE2} %{buildroot}%{_gamesbindir}/%{name} -%__install -pm 644 %{name}.cfg %{buildroot}%{_gamesdatadir}/%{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}/ - -%clean -%__rm -rf %{buildroot} +install -pm755 %{name} %{buildroot}%{_gamesbindir}/%{name}.bin +install -pm755 %{SOURCE2} %{buildroot}%{_gamesbindir}/%{name} +install -pm 644 %{name}.cfg %{buildroot}%{_gamesdatadir}/%{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}/ %files -%defattr(-,root,root) %doc AUTHORS changelog.txt COPYING LICENSE README %{_gamesbindir}/* %{_datadir}/pixmaps/%{name}.png