rpms/cyphesis/devel cyphesis-0.5.15-gcc43.patch, 1.1, 1.2 cyphesis.spec, 1.18, 1.19

[Michael Thomas (wart)]

Author: wart

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

Modified Files:
	cyphesis-0.5.15-gcc43.patch cyphesis.spec 
Log Message:
Update patch to fix gcc 4.3 build errors


cyphesis-0.5.15-gcc43.patch:

Index: cyphesis-0.5.15-gcc43.patch
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/devel/cyphesis-0.5.15-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cyphesis-0.5.15-gcc43.patch	11 Feb 2008 02:13:10 -0000	1.1
+++ cyphesis-0.5.15-gcc43.patch	22 Feb 2008 00:56:41 -0000	1.2
@@ -1,3 +1,35 @@
+--- cyphesis-0.5.15/tools/cyconvertrules.cpp.orig	2008-02-21 16:11:18.000000000 -0800
++++ cyphesis-0.5.15/tools/cyconvertrules.cpp	2008-02-21 16:11:27.000000000 -0800
+@@ -35,6 +35,7 @@
+ #include <string>
+ #include <fstream>
+ #include <iostream>
++#include <cstring>
+ 
+ using Atlas::Message::Element;
+ using Atlas::Message::MapType;
+--- cyphesis-0.5.15/tools/cyconfig.cpp.orig	2008-02-21 16:10:54.000000000 -0800
++++ cyphesis-0.5.15/tools/cyconfig.cpp	2008-02-21 16:11:06.000000000 -0800
+@@ -34,6 +34,8 @@
+ #include <varconf/config.h>
+ 
+ #include <cassert>
++#include <cstring>
++#include <cstdlib>
+ 
+ static int install(int argc, char ** argv)
+ {
+--- cyphesis-0.5.15/tools/cycmd.cpp.orig	2008-02-21 16:07:53.000000000 -0800
++++ cyphesis-0.5.15/tools/cycmd.cpp	2008-02-21 16:08:10.000000000 -0800
+@@ -70,6 +70,8 @@
+ 
+ #include <iostream>
+ #include <algorithm>
++#include <cstring>
++#include <cstdlib>
+ 
+ #include <cstdio>
+ 
 --- cyphesis-0.5.15/modules/DateTime.cpp.orig	2008-02-10 17:10:55.000000000 -0800
 +++ cyphesis-0.5.15/modules/DateTime.cpp	2008-02-10 17:11:09.000000000 -0800
 @@ -20,6 +20,7 @@
@@ -8,6 +40,46 @@
  
  // date_pat=re.compile("^|[-:]|\s+");
  
+--- cyphesis-0.5.15/server/CommServer.cpp.orig	2008-02-21 16:04:17.000000000 -0800
++++ cyphesis-0.5.15/server/CommServer.cpp	2008-02-21 16:04:26.000000000 -0800
+@@ -36,6 +36,7 @@
+ #include <skstream/sksocket.h>
+ 
+ #include <iostream>
++#include <cstring>
+ 
+ extern "C" {
+ #ifdef HAVE_EPOLL_CREATE
+--- cyphesis-0.5.15/server/CommListener.cpp.orig	2008-02-21 15:59:46.000000000 -0800
++++ cyphesis-0.5.15/server/CommListener.cpp	2008-02-21 16:00:07.000000000 -0800
+@@ -43,6 +43,7 @@
+ #include <errno.h>
+ 
+ #include <cassert>
++#include <cstring>
+ 
+ static const bool debug_flag = false;
+ 
+--- cyphesis-0.5.15/tests/Containertest.cpp.orig	2008-02-21 16:16:12.000000000 -0800
++++ cyphesis-0.5.15/tests/Containertest.cpp	2008-02-21 16:16:19.000000000 -0800
+@@ -22,6 +22,7 @@
+ #include <iostream>
+ 
+ #include <cassert>
++#include <cstdlib>
+ 
+ int main()
+ {
+--- cyphesis-0.5.15/tests/PropertyExerciser.cpp.orig	2008-02-21 16:39:03.000000000 -0800
++++ cyphesis-0.5.15/tests/PropertyExerciser.cpp	2008-02-21 16:39:09.000000000 -0800
+@@ -26,6 +26,7 @@
+ #include <Atlas/Objects/Anonymous.h>
+ 
+ #include <limits>
++#include <limits.h>
+ 
+ #include <cassert>
+ 
 --- cyphesis-0.5.15/common/Database.cpp.orig	2008-02-10 16:11:37.000000000 -0800
 +++ cyphesis-0.5.15/common/Database.cpp	2008-02-10 16:22:51.000000000 -0800
 @@ -33,6 +33,8 @@


Index: cyphesis.spec
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/devel/cyphesis.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cyphesis.spec	20 Feb 2008 06:52:58 -0000	1.18
+++ cyphesis.spec	22 Feb 2008 00:56:41 -0000	1.19
@@ -7,7 +7,7 @@
 
 Name:           cyphesis
 Version:        0.5.15
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        WorldForge game server
 Group:          System Environment/Libraries
 # Would be GPLv2+, except server/protocol_instructions.h is GPLv2 only.
@@ -248,6 +248,9 @@
 
 
 %changelog
+* Thu Feb 21 2008 Wart <wart at kobold.org> 0.5.15-6
+- Add patch to fix gcc4.3 build errors
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.15-5
 - Autorebuild for GCC 4.3