rpms/eris/devel eris-1.3.13-gcc43.patch, NONE, 1.1 eris.spec, 1.11, 1.12

[Michael Thomas (wart)]

Author: wart

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

Modified Files:
	eris.spec 
Added Files:
	eris-1.3.13-gcc43.patch 
Log Message:
Rebuild for gcc 4.3


eris-1.3.13-gcc43.patch:

--- NEW FILE eris-1.3.13-gcc43.patch ---
--- eris-1.3.13/Eris/Exceptions.h.orig	2008-02-09 18:10:52.000000000 -0800
+++ eris-1.3.13/Eris/Exceptions.h	2008-02-09 18:11:02.000000000 -0800
@@ -38,7 +38,7 @@
 public:
     InvalidAtlas(const std::string& msg, const Atlas::Objects::Root& obj);
     
-    InvalidAtlas(const std::string& msg, const Atlas::Message::Element& msg);
+    InvalidAtlas(const std::string& msg, const Atlas::Message::Element& msg1);
     
     virtual ~InvalidAtlas() throw();
 private:
--- eris-1.3.13/Eris/Connection.h.orig	2008-02-09 18:17:51.000000000 -0800
+++ eris-1.3.13/Eris/Connection.h	2008-02-10 11:08:19.000000000 -0800
@@ -10,6 +10,7 @@
 
 #include <deque>
 #include <map>
+#include <backward/auto_ptr.h>
 
 /** Every Eris class and type lives inside the Eris namespace; certain utility functions live in the
 Util namespace, since they may be moved to a generic WorldForge foundation library in the future.*/
--- eris-1.3.13/Eris/Metaserver.cpp.orig	2008-02-09 18:28:38.000000000 -0800
+++ eris-1.3.13/Eris/Metaserver.cpp	2008-02-09 18:28:51.000000000 -0800
@@ -18,6 +18,7 @@
 
 #include <cassert>
 #include <cstdio>
+#include <cstring>
 
 #ifdef __WIN32__
 
--- eris-1.3.13/Eris/Metaserver.h.orig	2008-02-09 18:39:04.000000000 -0800
+++ eris-1.3.13/Eris/Metaserver.h	2008-02-10 11:08:46.000000000 -0800
@@ -5,6 +5,7 @@
 
 #include <Eris/Types.h>
 #include <Eris/ServerInfo.h>
+#include <backward/auto_ptr.h>
 
 #include <Atlas/Objects/Decoder.h>
 
--- eris-1.3.13/Eris/Account.h.orig	2008-02-09 18:23:10.000000000 -0800
+++ eris-1.3.13/Eris/Account.h	2008-02-10 11:08:30.000000000 -0800
@@ -3,6 +3,7 @@
 
 #include <vector>
 #include <map>
+#include <backward/auto_ptr.h>
 
 #include <Eris/Types.h>
 #include <Eris/Timeout.h>
--- eris-1.3.13/Eris/EntityRef.h.orig	2008-02-10 11:20:19.000000000 -0800
+++ eris-1.3.13/Eris/EntityRef.h	2008-02-10 11:20:27.000000000 -0800
@@ -3,6 +3,7 @@
 
 #include <sigc++/trackable.h>
 #include <sigc++/signal.h>
+#include <string>
 
 namespace Eris
 {
--- eris-1.3.13/test/metaQuery.cpp.orig	2008-02-10 11:33:27.000000000 -0800
+++ eris-1.3.13/test/metaQuery.cpp	2008-02-10 11:42:53.000000000 -0800
@@ -8,6 +8,8 @@
 #include <sstream>
 #include <vector>
 #include <sigc++/functors/ptr_fun.h>
+#include <bits/basic_string.h>
+#include <bits/stl_algo.h>
 
 using std::endl;
 using std::cout;


Index: eris.spec
===================================================================
RCS file: /cvs/extras/rpms/eris/devel/eris.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- eris.spec	16 Dec 2007 17:49:25 -0000	1.11
+++ eris.spec	10 Feb 2008 19:46:35 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           eris
 Version:        1.3.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Client-side session layer for Atlas-C++
 
 Group:          Development/Libraries
@@ -9,6 +9,7 @@
 License:        LGPLv2+
 URL:            http://worldforge.org/dev/eng/libraries/eris
 Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.gz
+Patch0:         eris-1.3.13-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  wfmath-devel skstream-devel atlascpp-devel doxygen
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Sat Feb 9 2008 Wart <wart at kobold.org> 1.3.13-2
+- Rebuild for gcc 4.3
+
 * Sun Dec 16 2007 Wart <wart at kobold.org> 1.3.13-1
 - Update to 1.3.13
 - Remove multiarch conflicts (BZ #341071)