- rel 2; builds

Changed files:
    gdal-dods.patch -> 1.3
    gdal.spec -> 1.65

diff --git a/gdal-dods.patch b/gdal-dods.patch
index e15916c852d0d9841e9af6af07922c342e83f66e..cb92c2a0f17109ada6fe3342f6e02e78f8c07e85 100644 (file)
--- a/gdal-dods.patch
+++ b/gdal-dods.patch
@@ -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 ) )

diff --git a/gdal.spec b/gdal.spec
index f2bd03e2fca3ab44fc5cf4c524d47a3971d34b6a..15195520a4f6cebfc879a6fb2e51b9c17bcb96d4 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -9,7 +9,7 @@ Summary:        Geospatial Data Abstraction Library
 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