From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 14 Jul 2009 13:28:40 +0000 (+0000)
Subject: - up to 1.6.1
X-Git-Tag: auto/th/gdal-1_6_1-1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=0e1ff4942b3cfdcdbbbfba4e5e526be9d6486498;p=packages%2Fgdal.git

- up to 1.6.1

Changed files:
    gdal-dods.patch -> 1.2
    gdal.spec -> 1.64
---

diff --git a/gdal-dods.patch b/gdal-dods.patch
index c836503..e15916c 100644
--- a/gdal-dods.patch
+++ b/gdal-dods.patch
@@ -12,3 +12,25 @@
      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"
+ 
+-using namespace libdap;
+-
+ CPL_CVSID("$Id$");
+ 
+ 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>
+ 
+-using namespace libdap;
+-
+ /************************************************************************/
+ /*                           OGRDODSFieldDefn                           */
+ /************************************************************************/
diff --git a/gdal.spec b/gdal.spec
index 0972e9e..f2bd03e 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -8,12 +8,12 @@
 Summary:	Geospatial Data Abstraction Library
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
-Version:	1.5.4
-Release:	5
+Version:	1.6.1
+Release:	1
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.remotesensing.org/gdal/%{name}-%{version}.tar.gz
-# Source0-md5:	d5e411b6f11bd1f144af67d2045d2606
+# Source0-md5:	4059285a5cef41ff975ed0ec02a97009
 Patch0:		%{name}-dods.patch
 Patch1:		%{name}-perl.patch
 Patch2:		%{name}-ruby.patch