packages: gdal/gdal-dods.patch, gdal/gdal.spec - rel 2; builds

[arekm]

Author: arekm                        Date: Wed Jul 15 11:55:33 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; builds

---- Files affected:
packages/gdal:
   gdal-dods.patch (1.2 -> 1.3) , gdal.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: packages/gdal/gdal-dods.patch
diff -u packages/gdal/gdal-dods.patch:1.2 packages/gdal/gdal-dods.patch:1.3
--- packages/gdal/gdal-dods.patch:1.2	Tue Jul 14 15:28:39 2009
+++ packages/gdal/gdal-dods.patch	Wed Jul 15 13:55:27 2009
@@ -12,25 +12,59 @@
      else
        dnl Otherwise try to put things together in a more primitive way.
        LIBS="$LIBS -L$DODS_LIB -ldap++ -lpthread -lrx"
---- gdal-1.6.1/frmts/dods/dodsdataset2.cpp~	2008-08-22 19:39:47.000000000 +0200
-+++ gdal-1.6.1/frmts/dods/dodsdataset2.cpp	2009-07-14 15:08:02.545973283 +0200
-@@ -61,8 +61,6 @@
- #include "ogr_spatialref.h"
- #include "cpl_string.h"
+
+--- gdal-1.6.1/frmts/dods/dodsdataset2.cpp.org	2009-07-15 12:54:31.160838902 +0200
++++ gdal-1.6.1/frmts/dods/dodsdataset2.cpp	2009-07-15 12:58:38.080454628 +0200
+@@ -693,15 +693,15 @@
+ /* -------------------------------------------------------------------- */
+ /*      Try and fetch the corresponding DAS subtree if it exists.       */
+ /* -------------------------------------------------------------------- */
+-    AttrTable *poFileInfo = oDAS.find_container( "GLOBAL" );
++    AttrTable *poFileInfo = oDAS.container()->find_container( "GLOBAL" );
  
--using namespace libdap;
--
- CPL_CVSID("$Id$");
+     if( poFileInfo == NULL )
+     {
+-        poFileInfo = oDAS.find_container( "NC_GLOBAL" );
++        poFileInfo = oDAS.container()->find_container( "NC_GLOBAL" );
  
- CPL_C_START
---- gdal-1.6.1/ogr/ogrsf_frmts/dods/ogr_dods.h~	2008-10-23 02:04:33.000000000 +0200
-+++ gdal-1.6.1/ogr/ogrsf_frmts/dods/ogr_dods.h	2009-07-14 15:17:51.012634019 +0200
-@@ -68,8 +68,6 @@
- #include <Error.h>
- #include <escaping.h>
+ 	if( poFileInfo == NULL )
+ 	{
+-	    poFileInfo = oDAS.find_container( "HDF_GLOBAL" );
++	    poFileInfo = oDAS.container()->find_container( "HDF_GLOBAL" );
  
--using namespace libdap;
--
- /************************************************************************/
- /*                           OGRDODSFieldDefn                           */
- /************************************************************************/
+ 	    if( poFileInfo == NULL )
+ 	    {
+@@ -1275,7 +1275,7 @@
+ /* -------------------------------------------------------------------- */
+ /*      Try and fetch the corresponding DAS subtree if it exists.       */
+ /* -------------------------------------------------------------------- */
+-    AttrTable *poBandInfo = poDODS->GetDAS().find_container( oVarName );
++    AttrTable *poBandInfo = poDODS->GetDAS().container()->find_container( oVarName );
+ 
+     if( poBandInfo == NULL )
+     {
+--- gdal-1.6.1/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp~	2009-07-15 13:13:25.060367275 +0200
++++ gdal-1.6.1/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp	2009-07-15 13:13:49.337227887 +0200
+@@ -196,9 +196,9 @@
+     for( dv_i = oDAS.container()->attr_begin(); dv_i != oDAS.container()->attr_end(); dv_i++ )
+     {
+         if( EQUALN(oDAS.get_name(dv_i).c_str(),"ogr_layer_info",14) 
+-            && oDAS.is_container( dv_i ) )
++            && oDAS.container()->is_container( dv_i ) )
+         {
+-            AttrTable *poAttr = oDAS.get_attr_table( dv_i );
++            AttrTable *poAttr = oDAS.container()->get_attr_table( dv_i );
+             string target_container = poAttr->get_attr( "target_container" );
+             BaseType *poVar = poDDS->var( target_container.c_str() );
+             
+--- gdal-1.6.1/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp~	2009-07-15 13:14:32.077112316 +0200
++++ gdal-1.6.1/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp	2009-07-15 13:34:25.010626056 +0200
+@@ -193,7 +193,7 @@
+ /* -------------------------------------------------------------------- */
+     AttrTable::Attr_iter dv_i;
+ 
+-    for( dv_i = oDAS.attr_begin(); dv_i != oDAS.attr_end(); dv_i++ )
++    for( dv_i = oDAS.container()->attr_begin(); dv_i != oDAS.container()->attr_end(); dv_i++ )
+     {
+         if( EQUALN(oDAS.get_name(dv_i).c_str(),"ogr_layer_info",14) 
+             && oDAS.container()->is_container( dv_i ) )

================================================================
Index: packages/gdal/gdal.spec
diff -u packages/gdal/gdal.spec:1.64 packages/gdal/gdal.spec:1.65
--- packages/gdal/gdal.spec:1.64	Tue Jul 14 15:28:40 2009
+++ packages/gdal/gdal.spec	Wed Jul 15 13:55:27 2009
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
 Version:	1.6.1
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.remotesensing.org/gdal/%{name}-%{version}.tar.gz
@@ -319,6 +319,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2009/07/15 11:55:27  arekm
+- rel 2; builds
+
 Revision 1.64  2009/07/14 13:28:40  arekm
 - up to 1.6.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal-dods.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal.spec?r1=1.64&r2=1.65&f=u