rpms/gdal/devel gdal-libdap.patch,NONE,1.1 gdal.spec,1.47,1.48

[Patrice Dumas]

Author: pertusus

Update of /cvs/extras/rpms/gdal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6149

Modified Files:
	gdal.spec 
Added Files:
	gdal-libdap.patch 
Log Message:
* Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> - 1.5.2-2
- patch for libdap > 0.8.0, from Rob Cermak


gdal-libdap.patch:

--- NEW FILE gdal-libdap.patch ---
diff -up gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp.libdap~ gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp
--- gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp.libdap~	2008-09-09 16:49:39.000000000 +0200
+++ gdal-1.5.2-fedora/frmts/dods/dodsdataset2.cpp	2008-09-09 16:50:05.000000000 +0200
@@ -67,6 +67,8 @@ CPL_C_START
 void GDALRegister_DODS(void);
 CPL_C_END
 
+using namespace libdap ;
+
 /** Attribute names used to encode geo-referencing information. Note that
     these are not C++ objects to avoid problems with static global
     constructors. 
diff -up gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h.libdap~ gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h
--- gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h.libdap~	2008-09-09 16:50:50.000000000 +0200
+++ gdal-1.5.2-fedora/ogr/ogrsf_frmts/dods/ogr_dods.h	2008-09-09 16:51:19.000000000 +0200
@@ -68,6 +68,8 @@
 #include <Error.h>
 #include <escaping.h>
 
+using namespace libdap ;
+
 /************************************************************************/
 /*                           OGRDODSFieldDefn                           */
 /************************************************************************/


Index: gdal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- gdal.spec	12 Jun 2008 19:48:03 -0000	1.47
+++ gdal.spec	10 Sep 2008 12:59:02 -0000	1.48
@@ -1,6 +1,6 @@
 Name:      gdal
 Version:   1.5.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   GIS file format library
 Group:     System Environment/Libraries
 License:   MIT
@@ -9,6 +9,7 @@
 Source1:   http://download.osgeo.org/gdal/gdalautotest-1.5.0.tar.gz
 Patch0:    %{name}-perl510.patch
 Patch1:    %{name}-sincos.patch
+Patch2:    %{name}-libdap.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool pkgconfig
 BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel
@@ -95,6 +96,7 @@
 %setup -q -n %{name}-%{version}-fedora
 %patch0 -p0 -b .perl510~
 %patch1 -p0 -b .sincos~
+%patch2 -p1 -b .libdap~
 
 # unpack test cases olso.
 tar -xzf %{SOURCE1} .
@@ -518,6 +520,9 @@
 %endif
 
 %changelog
+* Tue Sep  9 2008 Patrice Dumas <pertusus at free.fr> - 1.5.2-2
+- patch for libdap > 0.8.0, from Rob Cermak
+
 * Thu Jun 12 2008 Balint Cristian <rezso at rdsor.ro> - 1.5.2-1
 - a new bugfix upstream
 - drop gcc43 patch