rpms/geos/F-9 geos-2.2.3-gcc43.patch,NONE,1.1 geos.spec,1.9,1.10

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/geos/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21189

Modified Files:
	geos.spec 
Added Files:
	geos-2.2.3-gcc43.patch 
Log Message:
fix compile with gcc 4.3

geos-2.2.3-gcc43.patch:

--- NEW FILE geos-2.2.3-gcc43.patch ---
diff -up geos-2.2.3/source/headers/geos/io.h.BAD geos-2.2.3/source/headers/geos/io.h
--- geos-2.2.3/source/headers/geos/io.h.BAD	2008-06-06 11:19:15.000000000 -0500
+++ geos-2.2.3/source/headers/geos/io.h	2008-06-06 11:19:18.000000000 -0500
@@ -19,7 +19,7 @@
 
 #include <memory>
 #include <iostream>
-#include <string>
+#include <cstring>
 #include <geos/platform.h>
 #include <geos/geom.h>
 #include <geos/util.h>
diff -up geos-2.2.3/source/headers/geos/util.h.BAD geos-2.2.3/source/headers/geos/util.h
--- geos-2.2.3/source/headers/geos/util.h.BAD	2008-06-06 11:19:42.000000000 -0500
+++ geos-2.2.3/source/headers/geos/util.h	2008-06-06 11:19:47.000000000 -0500
@@ -17,7 +17,7 @@
 #define GEOS_UTIL_H
 
 #include <memory>
-#include <string>
+#include <cstring>
 #include <geos/platform.h>
 #include <geos/geom.h>
 
diff -up geos-2.2.3/source/io/markup/MarkupSTL.cpp.BAD geos-2.2.3/source/io/markup/MarkupSTL.cpp
--- geos-2.2.3/source/io/markup/MarkupSTL.cpp.BAD	2008-06-06 11:30:08.000000000 -0500
+++ geos-2.2.3/source/io/markup/MarkupSTL.cpp	2008-06-06 11:40:18.000000000 -0500
@@ -6,6 +6,7 @@
 // Use in commercial applications requires written permission
 // This software is provided "as is", with no warranty.
 
+#include <string.h>
 #include "MarkupSTL.h"
 #include <stdio.h>
 
diff -up geos-2.2.3/source/io/markup/MarkupSTL.h.BAD geos-2.2.3/source/io/markup/MarkupSTL.h
--- geos-2.2.3/source/io/markup/MarkupSTL.h.BAD	2008-06-06 11:29:05.000000000 -0500
+++ geos-2.2.3/source/io/markup/MarkupSTL.h	2008-06-06 11:38:20.000000000 -0500
@@ -38,6 +38,8 @@
 #include <map>
 #include <vector>
 
+using namespace std;
+
 #ifdef _DEBUG
 #define _DS(i) (i?&(m_strDoc.c_str())[m_aPos[i].nStartL]:0)
 #define MARKUP_SETDEBUGSTATE m_pMainDS=_DS(m_iPos); m_pChildDS=_DS(m_iPosChild)


Index: geos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geos/F-9/geos.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- geos.spec	2 Jun 2008 17:09:04 -0000	1.9
+++ geos.spec	6 Jun 2008 17:23:05 -0000	1.10
@@ -1,12 +1,13 @@
 Name: geos
 Version: 2.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: GEOS is a C++ port of the Java Topology Suite
 
 Group: Applications/Engineering
-License: LGPL
+License: LGPLv2
 URL: http://geos.refractions.net
 Source0: http://geos.refractions.net/downloads/%{name}-%{version}.tar.bz2
+Patch0: geos-2.2.3-gcc43.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: doxygen
 
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc43
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -69,6 +71,10 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Fri Jun  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.2.3-3
+- fix license tag
+- fix compile with gcc 4.3
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.3-2
 - Autorebuild for GCC 4.3