Automatic import for version 20120301

This commit is contained in:
Rosa 2012-08-02 20:22:46 +00:00
parent 3b3a578796
commit 5cf580287b
3 changed files with 5 additions and 29 deletions

View file

@ -1,2 +1,2 @@
sources:
"fheroes2-src-r2860.tgz": 42a1ff9329621f0da261d9b1d39e9802fae9ae64
"fheroes2-src-r2767.tgz": f68b709ef57c0095415278dd43669e0fc5447bbf

View file

@ -1,12 +0,0 @@
diff -urN fheroes-src/src/Makefile fheroes-src-patched/src/Makefile
--- fheroes-src/src/Makefile 2012-04-05 12:37:02.000000000 +1100
+++ fheroes-src-patched/src/Makefile 2012-05-16 03:31:51.000000000 +1100
@@ -8,7 +8,7 @@
CFLAGS := $(CFLAGS) -Wall -fsigned-char
LDFLAGS := $(LDFLAGS)
-LIBS :=
+LIBS := $(shell pkg-config alsa --libs)
ifdef DEBUG
CFLAGS := $(CFLAGS) -O0 -g -pedantic -DWITH_DEBUG

View file

@ -1,6 +1,6 @@
%define rev r2860
%define rev r2767
Name: fheroes2
Version: 20120514
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: fheroes-linkage.patch
BuildRequires: gcc-c++
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
@ -28,9 +27,6 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively
%prep
%setup -qn fheroes-src
%patch0 -p1
# Fix AI settings recently hardcoded in Makefile (by mistake?)
%__sed -i s,"WITH_AI=empty","WITH_AI=simple",g Makefile
%build
%make WITH_AI=simple CONFIGURE_FHEROES2_DATA="%{_gamesdatadir}/%{name}/"
@ -56,6 +52,7 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively
%__rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc AUTHORS changelog.txt COPYING LICENSE README
%{_gamesbindir}/*
%{_datadir}/pixmaps/%{name}.png
@ -65,16 +62,7 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively
%changelog
* Tue May 15 2012 Andrey Bondrov <abondrov@mandriva.org> 20120514-1
+ Revision: 799042
- Fix AI settings and linkage
- New official snapshot 2860 from 2012.05.14
* Fri Apr 13 2012 Andrey Bondrov <abondrov@mandriva.org> 20120413-1
+ Revision: 790457
- New official snapshot 2836 from 2012.04.13
* Mon Mar 12 2012 Andrey Bondrov <abondrov@mandriva.org> 20120301-1
* Mon Mar 12 2012 Andrey Bondrov <abondrov@mandriva.org> 20120301-1mdv2011.0
+ Revision: 784372
- New official snapshot 2767 from 2012.03.01