rpms/xbase/devel xbase-2.0.0-gcc43.patch, NONE, 1.1 xbase.spec, 1.7, 1.8

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	xbase.spec 
Added Files:
	xbase-2.0.0-gcc43.patch 
Log Message:
* Fri Jan 25 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.0-9
- Fix building with gcc 4.3 (also fixes building of xbase using packages)


xbase-2.0.0-gcc43.patch:

--- NEW FILE xbase-2.0.0-gcc43.patch ---
diff -up xbase-2.0.0/xbase/xbstring.h~ xbase-2.0.0/xbase/xbstring.h
--- xbase-2.0.0/xbase/xbstring.h~	2008-01-25 16:33:53.000000000 +0100
+++ xbase-2.0.0/xbase/xbstring.h	2008-01-25 16:33:53.000000000 +0100
@@ -56,7 +56,9 @@
 #endif
 
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
 
 /*! \file xbstring.h
 */
diff -up xbase-2.0.0/xbase/ndx.cpp~ xbase-2.0.0/xbase/ndx.cpp
--- xbase-2.0.0/xbase/ndx.cpp~	2008-01-25 16:35:11.000000000 +0100
+++ xbase-2.0.0/xbase/ndx.cpp	2008-01-25 16:35:11.000000000 +0100
@@ -66,7 +66,8 @@
 #endif
 
 #include <xbase/xbase.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #ifdef XB_INDEX_NDX
 
diff -up xbase-2.0.0/xbase/dbf.h~ xbase-2.0.0/xbase/dbf.h
--- xbase-2.0.0/xbase/dbf.h~	2008-01-25 16:34:15.000000000 +0100
+++ xbase-2.0.0/xbase/dbf.h	2008-01-25 16:34:15.000000000 +0100
@@ -65,7 +65,9 @@
 #include <xbase/xtypes.h>
 #include <xbase/xdate.h>
 
-#include <iostream.h>
+#include <iostream>
+using namespace std;
+
 #include <stdio.h>
 
 /*! \file dbf.h
diff -up xbase-2.0.0/xbase/stack.cpp~ xbase-2.0.0/xbase/stack.cpp
--- xbase-2.0.0/xbase/stack.cpp~	2008-01-25 16:35:47.000000000 +0100
+++ xbase-2.0.0/xbase/stack.cpp	2008-01-25 16:35:47.000000000 +0100
@@ -59,7 +59,8 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <iostream.h>
+#include <iostream>
+using namespace std;
 
 #include <xbase/xstack.h>
 


Index: xbase.spec
===================================================================
RCS file: /cvs/extras/rpms/xbase/devel/xbase.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xbase.spec	30 Oct 2007 13:42:54 -0000	1.7
+++ xbase.spec	25 Jan 2008 15:56:03 -0000	1.8
@@ -1,7 +1,7 @@
 Name:		xbase
 Summary: 	XBase compatible database library
 Version: 	2.0.0
-Release: 	8%{?dist}
+Release: 	9%{?dist}
 License: 	LGPLv2+
 Group: 		System Environment/Libraries
 URL:		http://linux.techass.com/projects/xdb/
@@ -9,6 +9,7 @@
 Patch0:		xbase-2.0.0-fixconfig.patch
 Patch1:		xbase-2.0.0-fixheader.patch
 Patch2:		xbase-2.0.0-ppc.patch
+Patch3:         xbase-2.0.0-gcc43.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	doxygen
 
@@ -49,6 +50,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure --disable-static
@@ -97,6 +99,9 @@
 %{_bindir}/dbfutil1
 
 %changelog
+* Fri Jan 25 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.0.0-9
+- Fix building with gcc 4.3 (also fixes building of xbase using packages)
+
 * Tue Oct 30 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.0-8
 - fix multilib conflicts