rpms/spring/devel spring-0.80.5.2-includes.patch, NONE, 1.1 spring.spec, 1.13, 1.14

[Aurelien Bompard]

Author: abompard

Update of /cvs/pkgs/rpms/spring/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20744

Modified Files:
	spring.spec 
Added Files:
	spring-0.80.5.2-includes.patch 
Log Message:
Fix build error on rawhide

spring-0.80.5.2-includes.patch:
 ConfigHandler.cpp |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE spring-0.80.5.2-includes.patch ---
diff -up ./rts/System/ConfigHandler.cpp.includes ./rts/System/ConfigHandler.cpp
--- ./rts/System/ConfigHandler.cpp.includes	2010-01-24 06:39:25.426129977 +0100
+++ ./rts/System/ConfigHandler.cpp	2010-01-24 06:40:26.377789515 +0100
@@ -16,10 +16,8 @@
 #include <stdexcept>
 #ifndef WIN32
 #include <unistd.h>
-#endif
-
-#ifdef __APPLE__
 #include <sys/stat.h>
+#include <sys/types.h>
 #endif
 
 #ifdef WIN32


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/devel/spring.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- spring.spec	21 Jan 2010 22:01:11 -0000	1.13
+++ spring.spec	24 Jan 2010 05:43:12 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           spring
 Version:        0.80.5.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
 Group:          Amusements/Games
@@ -20,6 +20,8 @@ Source1:        spring-README.Fedora
 Patch0:         spring-0.80.2-allegro.patch
 # http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
 Patch1:         spring-0.80.5.2-staticlib.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=558136
+Patch2:         spring-0.80.5.2-includes.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -58,6 +60,7 @@ cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
 %patch0 -p0 -b .allegro
 %patch1 -p0 -b .staticlib
+%patch2 -p0 -b .includes
 find rts/lib/7z -type f | xargs chmod -x