Automatic import for version 20120514

This commit is contained in:
Rosa 2012-05-17 05:50:04 +04:00
parent 055db12ad8
commit 8673279d82
3 changed files with 25 additions and 5 deletions

View file

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

12
fheroes-linkage.patch Normal file
View file

@ -0,0 +1,12 @@
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 r2836 %define rev r2860
Name: fheroes2 Name: fheroes2
Version: 20120413 Version: 20120514
Release: %mkrel 1 Release: %mkrel 1
Summary: Free implementation of Heroes of the Might and Magic II engine Summary: Free implementation of Heroes of the Might and Magic II engine
License: GPL License: GPL
@ -11,6 +11,7 @@ Source2: %{name}.sh
Source3: %{name}.png Source3: %{name}.png
Source4: %{name}.desktop Source4: %{name}.desktop
Source5: %{name}.cfg Source5: %{name}.cfg
Patch0: fheroes-linkage.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: SDL_image-devel BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel BuildRequires: SDL_mixer-devel
@ -27,6 +28,9 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively
%prep %prep
%setup -qn fheroes-src %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 %build
%make WITH_AI=simple CONFIGURE_FHEROES2_DATA="%{_gamesdatadir}/%{name}/" %make WITH_AI=simple CONFIGURE_FHEROES2_DATA="%{_gamesdatadir}/%{name}/"
@ -52,7 +56,6 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%files %files
%defattr(-,root,root)
%doc AUTHORS changelog.txt COPYING LICENSE README %doc AUTHORS changelog.txt COPYING LICENSE README
%{_gamesbindir}/* %{_gamesbindir}/*
%{_datadir}/pixmaps/%{name}.png %{_datadir}/pixmaps/%{name}.png
@ -62,7 +65,12 @@ into your /usr/share/games/fheroes2/{maps,data} directories respectively
%changelog %changelog
* Fri Apr 13 2012 Andrey Bondrov <abondrov@mandriva.org> 20120413-1mdv2012.0 * Tue May 15 2012 Andrey Bondrov <abondrov@mandriva.org> 20120514-1mdv2012.0
+ 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 + Revision: 790457
- New official snapshot 2836 from 2012.04.13 - New official snapshot 2836 from 2012.04.13