rpms/wesnoth/devel wesnoth-1.2.8-gcc43.patch, NONE, 1.1 wesnoth.spec, 1.47, 1.48

[Warren Togami 砥上勇 (wtogami)]

Author: wtogami

Update of /cvs/pkgs/rpms/wesnoth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1647

Modified Files:
	wesnoth.spec 
Added Files:
	wesnoth-1.2.8-gcc43.patch 
Log Message:
Make it build against gcc-4.3


wesnoth-1.2.8-gcc43.patch:

--- NEW FILE wesnoth-1.2.8-gcc43.patch ---
--- wesnoth-1.2.8/src/server/game.cpp.orig	2008-02-11 18:16:19.000000000 -0500
+++ wesnoth-1.2.8/src/server/game.cpp	2008-02-11 18:16:31.000000000 -0500
@@ -20,6 +20,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <algorithm>
 
 #define LOG_SERVER LOG_STREAM(info, general)
 


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- wesnoth.spec	9 Feb 2008 00:35:39 -0000	1.47
+++ wesnoth.spec	12 Feb 2008 02:22:40 -0000	1.48
@@ -1,6 +1,6 @@
 Name:           wesnoth
 Version:        1.2.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 Source1:        wesnothd.init
 Source2:        %{name}.sysconfig
 Patch0:		%{name}-%{version}-remove-ogg-test.patch
+Patch1:         %{name}-%{version}-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	SDL_image-devel
@@ -71,6 +72,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .ogg
+%patch1 -p1 -b .gcc43
 autoreconf
 chmod -x MANUAL*
 
@@ -168,6 +170,9 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Mon Feb 11 2008 Warren Togami <wtogami at redhat.com> - 1.2.8-5
+- Patch to fix build with gcc-4.3.
+
 * Fri Feb  8 2008 Brian Pepple <bpepple at fedoraproject.org> - 1.2.8-4
 - Rebuild for gcc-4.3.