rpms/stratagus/devel stratagus-gcc43.patch, NONE, 1.1 stratagus.spec, 1.21, 1.22

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/stratagus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5077

Modified Files:
	stratagus.spec 
Added Files:
	stratagus-gcc43.patch 
Log Message:
* Tue Feb 26 2008 Jindrich Novy <jnovy at redhat.com> 2.2.4-4
- fix build in gcc-4.3 (#434370)
- rebuild against new libmikmod (#434783)


stratagus-gcc43.patch:

--- NEW FILE stratagus-gcc43.patch ---
diff -up stratagus-2.2.4/src/video/movie.cpp.gcc43 stratagus-2.2.4/src/video/movie.cpp
--- stratagus-2.2.4/src/video/movie.cpp.gcc43	2006-11-22 17:32:21.000000000 +0100
+++ stratagus-2.2.4/src/video/movie.cpp	2008-02-26 11:43:55.000000000 +0100
@@ -299,6 +299,7 @@ int PlayMovie(const std::string &name)
 #else
 
 #include <string>
+#include <cstring>
 
 /**
 **  FIXME: docu


Index: stratagus.spec
===================================================================
RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- stratagus.spec	23 Feb 2008 12:06:48 -0000	1.21
+++ stratagus.spec	26 Feb 2008 10:47:46 -0000	1.22
@@ -1,13 +1,13 @@
 Name: 		stratagus
 Summary: 	Real-time strategy gaming engine
 Version: 	2.2.4
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	GPLv2
 Group: 		Development/Libraries
 URL:		http://www.stratagus.org/
 Source0: 	http://dl.sf.net/%{name}/%{name}-%{version}-src.tar.gz
 Patch0:		stratagus--use_external_tolua.diff
-#Patch1:	stratagus--use-lua51.diff
+Patch1:		stratagus-gcc43.patch
 BuildRequires:	mikmod-devel
 BuildRequires:	tolua++-devel
 BuildRequires:  lua-devel
@@ -30,17 +30,16 @@
 of current games using the stratagus engine.
 
 %prep
-%setup -q 
+%setup -q
 %patch0
-#%patch1
-#sed -i 's/DEBUG_CFLAGS=.*/DEBUG_CFLAGS="%{optflags}"/g' configure
+%patch1 -p1 -b .gcc43
 
 %build
 %configure  	--with-x \
 		--with-bz2 \
 		--with-ogg \
 		--with-mikmod \
-		--with-opengl 
+		--with-opengl
 
 %{__make}
 
@@ -58,6 +57,10 @@
 %{_bindir}/stratagus
 
 %changelog
+* Tue Feb 26 2008 Jindrich Novy <jnovy at redhat.com> 2.2.4-4
+- fix build in gcc-4.3 (#434370)
+- rebuild against new libmikmod (#434783)
+
 * Sat Feb 23 2008 Peter Lemenkov <lemenkov at gmail.com> 2.2.4-3
 - rebuild