diff --git a/.abf.yml b/.abf.yml index 83da6ef..0e060b4 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - "fheroes2-src-r2693.tgz": eb2ea3323e1f3bde05ba5c35a12db6f7f8b6f39e + "fheroes2-src-r2767.tgz": f68b709ef57c0095415278dd43669e0fc5447bbf diff --git a/fheroes2-r2693-zlib.patch b/fheroes2-r2693-zlib.patch deleted file mode 100644 index f5dbbf8..0000000 --- a/fheroes2-r2693-zlib.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN fheroes-src/src/engine/IMG_savepng.cpp fheroes-src-patched/src/engine/IMG_savepng.cpp ---- fheroes-src/src/engine/IMG_savepng.cpp 2010-03-23 11:44:39.000000000 +1000 -+++ fheroes-src-patched/src/engine/IMG_savepng.cpp 2011-12-09 00:48:27.819222589 +1100 -@@ -29,6 +29,7 @@ - * 11/08/2004 - Compr fix, levels -1,1-7 now work - Tyler Montbriand - */ - #include -+#include - #include "SDL.h" - #include "IMG_savepng.h" - diff --git a/fheroes2.sh b/fheroes2.sh old mode 100755 new mode 100644 diff --git a/fheroes2.spec b/fheroes2.spec index 4d5b6e6..79302e2 100644 --- a/fheroes2.spec +++ b/fheroes2.spec @@ -1,6 +1,6 @@ -%define rev r2693 +%define rev r2767 Name: fheroes2 -Version: 20111109 +Version: 20120301 Release: %mkrel 1 Summary: Free implementation of Heroes of the Might and Magic II engine License: GPL @@ -11,7 +11,6 @@ Source2: %{name}.sh Source3: %{name}.png Source4: %{name}.desktop Source5: %{name}.cfg -Patch0: fheroes2-r2693-zlib.patch BuildRequires: gcc-c++ BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel @@ -28,12 +27,12 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively %prep %setup -qn fheroes-src -%patch0 -p1 -b .zlib %build %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 @@ -49,6 +48,9 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively %__install -pm 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/%{name}.desktop %__install -pm 644 %{SOURCE5} %{buildroot}%{_gamesdatadir}/%{name}/ +%clean +%__rm -rf %{buildroot} + %files %defattr(-,root,root) %doc AUTHORS changelog.txt COPYING LICENSE README @@ -60,7 +62,11 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively %changelog -* Thu Dec 08 2011 Andrey Bondrov 20111109-1mdv2012.0 +* Mon Mar 12 2012 Andrey Bondrov 20120301-1mdv2012.0 ++ Revision: 784372 +- New official snapshot 2767 from 2012.03.01 + +* Thu Dec 08 2011 Andrey Bondrov 20111109-1 + Revision: 739019 - imported package fheroes2