From 80faacbe3f679e123c81622145597dd6a58aff80 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 15 May 2003 23:06:58 +0000
Subject: [PATCH] - updated xerces patch - ready for xerces-c 2.2.0

Changed files:
    gdal-xerces.patch -> 1.2
    gdal.spec -> 1.3
---
 gdal-xerces.patch | 38 +++++++++++++++++++++++++++++++++-----
 gdal.spec         |  4 ++--
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/gdal-xerces.patch b/gdal-xerces.patch
index 3641632..66ff431 100644
--- a/gdal-xerces.patch
+++ b/gdal-xerces.patch
@@ -1,10 +1,38 @@
---- gdal-1.1.8/ogr/ogrsf_frmts/gml/gmlreaderp.h.orig	Wed Mar  6 21:08:02 2002
-+++ gdal-1.1.8/ogr/ogrsf_frmts/gml/gmlreaderp.h	Sun Jan 26 14:37:19 2003
-@@ -46,6 +46,7 @@
+--- gdal-1.1.8/configure.in.orig	2003-05-16 00:05:10.000000000 +0200
++++ gdal-1.1.8/configure.in	2003-05-16 00:10:51.000000000 +0200
+@@ -747,8 +747,13 @@
+     fi
+   fi
+ 
+-  echo '#include <util/PlatformUtils.hpp>' > conftest.cpp
+-  echo 'int main() {  XMLPlatformUtils::Initialize(); }' >> conftest.cpp
++  cat > conftest.cpp <<EOF
++#include <util/PlatformUtils.hpp>
++#ifdef XERCES_CPP_NAMESPACE_USE
++XERCES_CPP_NAMESPACE_USE
++#endif
++int main() {  XMLPlatformUtils::Initialize(); }
++EOF
+   CMD="${CXX} ${XERCES_INCLUDE} ${CPPFLAGS} -o conftest conftest.cpp $LIBS"
+ 
+   if test -z "`$CMD 2>&1`" ; then
+--- gdal-1.1.8/ogr/ogrsf_frmts/gml/gmlreaderp.h.orig	2003-05-16 00:27:43.000000000 +0200
++++ gdal-1.1.8/ogr/ogrsf_frmts/gml/gmlreaderp.h	2003-05-16 00:28:30.000000000 +0200
+@@ -46,13 +46,16 @@
  
  #include "gmlreader.h"
  
-+#undef INFINITY
- #include <dom/DOMString.hpp>
+-#include <dom/DOMString.hpp>
  #include <util/PlatformUtils.hpp>
  #include <sax2/DefaultHandler.hpp>
+ #include <sax2/ContentHandler.hpp>
+ #include <sax2/SAX2XMLReader.hpp>
+ #include <sax2/XMLReaderFactory.hpp>
+ 
++#ifdef XERCES_CPP_NAMESPACE_USE
++XERCES_CPP_NAMESPACE_USE
++#endif
++
+ /************************************************************************/
+ /*          XMLCh / char translation functions - trstring.cpp           */
+ /************************************************************************/
diff --git a/gdal.spec b/gdal.spec
index 84a8b79..bfb6027 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -31,7 +31,7 @@ BuildRequires:	postgresql-devel
 BuildRequires:	postgresql-backend-devel
 BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
-BuildRequires:	xerces-c-devel = 1.7.0
+BuildRequires:	xerces-c-devel >= 2.2.0
 BuildRequires:	zlib-devel >= 1.1.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -100,7 +100,7 @@ Modu
 %configure \
 	--with-xerces \
 	--with-xerces-inc=/usr/include/xercesc \
-	--with-xerces-lib="-lxerces-c1_7_0" \
+	--with-xerces-lib="-lxerces-c" \
 	--without-grass
 
 %{__make}
-- 
2.44.0