[spring] - Boost fix. - AI compilation fix.
Gilboa Davara
gilboa at fedoraproject.org
Thu Mar 10 03:45:59 UTC 2011
commit 00692334456c5fe62804546e60e0e9ffe356773b
Author: Gilboa Davara <gilboa at gilboa-home-dev.localdomain>
Date: Thu Mar 10 05:45:40 2011 +0200
- Boost fix.
- AI compilation fix.
spring-AI-compile-fix.patch | 10 ++++++++++
spring.spec | 11 ++++++++++-
2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/spring-AI-compile-fix.patch b/spring-AI-compile-fix.patch
new file mode 100644
index 0000000..8d99dbb
--- /dev/null
+++ b/spring-AI-compile-fix.patch
@@ -0,0 +1,10 @@
+--- AI/Skirmish/E323AI/AAStar.h.old 2011-03-10 05:31:35.558283029 +0200
++++ AI/Skirmish/E323AI/AAStar.h 2011-03-10 05:31:42.333474485 +0200
+@@ -1,6 +1,6 @@
+ #ifndef E323ASTAR_H
+ #define E323ASTAR_H
+-
++#include <cstdio>
+ #include <queue>
+ #include <vector>
+ #include <list>
diff --git a/spring.spec b/spring.spec
index 88d0be3..262eac7 100644
--- a/spring.spec
+++ b/spring.spec
@@ -1,6 +1,6 @@
Name: spring
Version: 0.82.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Multiplayer, 3D realtime strategy combat game
Group: Amusements/Games
@@ -15,6 +15,7 @@ License: GPLv2+ and GPLv3+ and LGPLv2 and GFDL and (GFDL or CC-BY)
URL: http://springrts.com
Source0: http://downloads.sourceforge.net/project/springrts/springrts/spring-%{version}/spring_%{version}_src.tar.lzma
Source1: spring-README.Fedora
+Patch0: spring-AI-compile-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,11 +53,15 @@ great resource, read it here: http://spring.clan-sy.com/wiki/Main_Page
%prep
%setup -q -n %{name}_%{version}
cp -p %{SOURCE1} README.Fedora
+%patch0 -p0 -b .spring-AI-compile-fix
touch ./rts/build/cmake/FindAllegro.cmake
find rts/lib/7z -type f | xargs chmod -x
%build
+# Use boost filesystem 2 explicitly (bug 654807)
+export CFLAGS="$CFLAGS -DBOOST_FILESYSTEM_VERSION=2"
+export CXXFLAGS="$CXXFLAGS -DBOOST_FILESYSTEM_VERSION=2"
# BUILD_SHARED_LIBS = ON causes a build failure:
# http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
# -DBUILD_SHARED_LIBS:BOOL=OFF \
@@ -137,6 +142,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 10 2011 Gilboa Davara <gilboad [AT] gmail [DOT] com> - 0.82.7.1-3
+- Boost fix (req for F15).
+- AI compile fix.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.82.7.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list