packages: gdal/gdal.spec, gdal/gdal-libdap.patch (NEW) - added libdap patch...
qboosh
qboosh at pld-linux.org
Tue Oct 12 21:09:17 CEST 2010
Author: qboosh Date: Tue Oct 12 19:09:17 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- added libdap patch for libdap 3.10+
- updated some deps
---- Files affected:
packages/gdal:
gdal.spec (1.76 -> 1.77) , gdal-libdap.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/gdal/gdal.spec
diff -u packages/gdal/gdal.spec:1.76 packages/gdal/gdal.spec:1.77
--- packages/gdal/gdal.spec:1.76 Mon Aug 23 22:02:33 2010
+++ packages/gdal/gdal.spec Tue Oct 12 21:09:11 2010
@@ -1,5 +1,6 @@
# $Revision$, $Date$
# TODO: csharp, java, mysql
+# use external pcidsk (http://home.gdal.org/projects/pcidsk/)?
#
# Conditional build:
%bcond_without odbc # disable odbc support
@@ -19,19 +20,20 @@
Patch1: %{name}-ruby.patch
Patch2: %{name}-asneeded.patch
Patch3: %{name}-python_install.patch
+Patch4: %{name}-libdap.patch
URL: http://www.gdal.org/
BuildRequires: autoconf >= 2.52
BuildRequires: automake
BuildRequires: cfitsio-devel
BuildRequires: doxygen
BuildRequires: expat-devel >= 1.95.0
-BuildRequires: geos-devel >= 2.0
+BuildRequires: geos-devel >= 2.2
BuildRequires: giflib-devel >= 4.0
BuildRequires: hdf-devel >= 4.0
BuildRequires: hdf5-devel
BuildRequires: jasper-devel
BuildRequires: libcsf-devel
-BuildRequires: libdap-devel >= 3.5
+BuildRequires: libdap-devel >= 3.10
BuildRequires: libgeotiff-devel >= 1.2.1
BuildRequires: libjpeg-devel >= 6b
BuildRequires: libpng-devel >= 2:1.2.8
@@ -62,7 +64,7 @@
%{?with_odbc:BuildRequires: unixODBC-devel}
%{?with_xerces:BuildRequires: xerces-c-devel >= 2.2.0}
BuildRequires: zlib-devel >= 1.1.4
-Requires: geos >= 2.0
+Requires: geos >= 2.2
Requires: libgeotiff >= 1.2.1
Requires: libpng >= 2:1.2.8
Requires: libtiff >= 3.6.0
@@ -91,13 +93,13 @@
Requires: %{name} = %{version}-%{release}
Requires: cfitsio-devel
Requires: expat-devel >= 1.95.0
-Requires: geos-devel >= 2.0
+Requires: geos-devel >= 2.2
Requires: giflib-devel
Requires: hdf-devel >= 4.0
Requires: hdf5-devel
Requires: jasper-devel
Requires: libcsf-devel
-Requires: libdap-devel >= 3.5
+Requires: libdap-devel >= 3.10
Requires: libgeotiff-devel >= 1.2.1
Requires: libjpeg-devel
Requires: libpng-devel >= 2:1.2.8
@@ -173,13 +175,14 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# need to regenerate (old ones don't support perl 5.10)
-rm swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
+%{__rm} swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
# includes updated for Ruby 1.9
-rm swig/ruby/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
+%{__rm} swig/ruby/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
-rm -rf man
+%{__rm} -r man
%build
# $PYTHON_INCLUDES is set only with --with-ogpython, but we have --with-python,
@@ -257,13 +260,69 @@
%files
%defattr(644,root,root,755)
%doc NEWS PROVENANCE.TXT
-%attr(755,root,root) %{_bindir}/*
-%exclude %{_bindir}/gdal-config
+%attr(755,root,root) %{_bindir}/epsg_tr.py
+%attr(755,root,root) %{_bindir}/esri2wkt.py
+%attr(755,root,root) %{_bindir}/gcps2vec.py
+%attr(755,root,root) %{_bindir}/gcps2wld.py
+%attr(755,root,root) %{_bindir}/gdal2tiles.py
+%attr(755,root,root) %{_bindir}/gdal2xyz.py
+%attr(755,root,root) %{_bindir}/gdal_contour
+%attr(755,root,root) %{_bindir}/gdal_fillnodata.py
+%attr(755,root,root) %{_bindir}/gdal_grid
+%attr(755,root,root) %{_bindir}/gdal_merge.py
+%attr(755,root,root) %{_bindir}/gdal_polygonize.py
+%attr(755,root,root) %{_bindir}/gdal_proximity.py
+%attr(755,root,root) %{_bindir}/gdal_rasterize
+%attr(755,root,root) %{_bindir}/gdal_retile.py
+%attr(755,root,root) %{_bindir}/gdal_sieve.py
+%attr(755,root,root) %{_bindir}/gdal_translate
+%attr(755,root,root) %{_bindir}/gdaladdo
+%attr(755,root,root) %{_bindir}/gdalbuildvrt
+%attr(755,root,root) %{_bindir}/gdalchksum.py
+%attr(755,root,root) %{_bindir}/gdaldem
+%attr(755,root,root) %{_bindir}/gdalenhance
+%attr(755,root,root) %{_bindir}/gdalident.py
+%attr(755,root,root) %{_bindir}/gdalimport.py
+%attr(755,root,root) %{_bindir}/gdalinfo
+%attr(755,root,root) %{_bindir}/gdalmanage
+%attr(755,root,root) %{_bindir}/gdaltindex
+%attr(755,root,root) %{_bindir}/gdaltransform
+%attr(755,root,root) %{_bindir}/gdalwarp
+%attr(755,root,root) %{_bindir}/mkgraticule.py
+%attr(755,root,root) %{_bindir}/nearblack
+%attr(755,root,root) %{_bindir}/ogr2ogr
+%attr(755,root,root) %{_bindir}/ogrinfo
+%attr(755,root,root) %{_bindir}/ogrtindex
+%attr(755,root,root) %{_bindir}/pct2rgb.py
+%attr(755,root,root) %{_bindir}/rgb2pct.py
+%attr(755,root,root) %{_bindir}/testepsg
%attr(755,root,root) %{_libdir}/libgdal.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libgdal.so.1
%{_datadir}/gdal
-%{_mandir}/man1/*
-%exclude %{_mandir}/man1/gdal-config.1*
+%{_mandir}/man1/gdal2tiles.1*
+%{_mandir}/man1/gdal_contour.1*
+%{_mandir}/man1/gdal_fillnodata.1*
+%{_mandir}/man1/gdal_grid.1*
+%{_mandir}/man1/gdal_merge.1*
+%{_mandir}/man1/gdal_rasterize.1*
+%{_mandir}/man1/gdal_retile.1*
+%{_mandir}/man1/gdal_sieve.1*
+%{_mandir}/man1/gdal_translate.1*
+%{_mandir}/man1/gdal_utilities.1*
+%{_mandir}/man1/gdaladdo.1*
+%{_mandir}/man1/gdalbuildvrt.1*
+%{_mandir}/man1/gdaldem.1*
+%{_mandir}/man1/gdalinfo.1*
+%{_mandir}/man1/gdaltindex.1*
+%{_mandir}/man1/gdaltransform.1*
+%{_mandir}/man1/gdalwarp.1*
+%{_mandir}/man1/nearblack.1*
+%{_mandir}/man1/ogr2ogr.1*
+%{_mandir}/man1/ogr_utilities.1*
+%{_mandir}/man1/ogrinfo.1*
+%{_mandir}/man1/ogrtindex.1*
+%{_mandir}/man1/pct2rgb.1*
+%{_mandir}/man1/rgb2pct.1*
%files devel
%defattr(644,root,root,755)
@@ -271,7 +330,16 @@
%attr(755,root,root) %{_bindir}/gdal-config
%attr(755,root,root) %{_libdir}/libgdal.so
%{_libdir}/libgdal.la
-%{_includedir}/*.h
+%{_includedir}/cpl_*.h
+%{_includedir}/cplkeywordparser.h
+%{_includedir}/gdal*.h
+%{_includedir}/gvgcpfit.h
+%{_includedir}/memdataset.h
+%{_includedir}/ogr_*.h
+%{_includedir}/ogrsf_frmts.h
+%{_includedir}/rawdataset.h
+%{_includedir}/thinplatespline.h
+%{_includedir}/vrtdataset.h
%{_mandir}/man1/gdal-config.1*
%files static
@@ -332,6 +400,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.77 2010/10/12 19:09:11 qboosh
+- added libdap patch for libdap 3.10+
+- updated some deps
+
Revision 1.76 2010/08/23 20:02:33 glen
- release 4
================================================================
Index: packages/gdal/gdal-libdap.patch
diff -u /dev/null packages/gdal/gdal-libdap.patch:1.1
--- /dev/null Tue Oct 12 21:09:17 2010
+++ packages/gdal/gdal-libdap.patch Tue Oct 12 21:09:11 2010
@@ -0,0 +1,107 @@
+--- gdal-1.7.2/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp.orig 2010-04-24 01:21:25.000000000 +0200
++++ gdal-1.7.2/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp 2010-10-11 07:45:03.847736015 +0200
+@@ -150,7 +150,7 @@ int OGRDODSDataSource::Open( const char
+
+ try
+ {
+- poConnection = new AISConnect( oBaseURL );
++ poConnection = new Connect( oBaseURL );
+ version = poConnection->request_version();
+ }
+ catch (Error &e)
+--- gdal-1.7.2/ogr/ogrsf_frmts/dods/ogr_dods.h.orig 2010-04-24 01:21:25.000000000 +0200
++++ gdal-1.7.2/ogr/ogrsf_frmts/dods/ogr_dods.h 2010-10-11 07:45:35.795741882 +0200
+@@ -61,7 +61,7 @@
+ #include <Sequence.h>
+ #include <Grid.h>
+
+-#include <AISConnect.h>
++#include <Connect.h>
+ #include <DDS.h>
+ #include <DAS.h>
+ #include <BaseTypeFactory.h>
+@@ -122,7 +122,7 @@ class OGRDODSLayer : public OGRLayer
+ virtual int ProvideDataDDS();
+ int bDataLoaded;
+
+- AISConnect *poConnection;
++ Connect *poConnection;
+ DataDDS *poDataDDS;
+
+ BaseType *poTargetVar;
+@@ -300,7 +300,7 @@ class OGRDODSDataSource : public OGRData
+ void AddLayer( OGRDODSLayer * );
+
+ public: // Just intended for read access by layer classes.
+- AISConnect *poConnection;
++ Connect *poConnection;
+
+ DAS oDAS;
+ DDS *poDDS;
+--- gdal-1.7.2/ogr/ogrsf_frmts/dods/ogrdodslayer.cpp.orig 2010-04-24 01:21:25.000000000 +0200
++++ gdal-1.7.2/ogr/ogrsf_frmts/dods/ogrdodslayer.cpp 2010-10-11 07:45:57.947740205 +0200
+@@ -213,7 +213,7 @@ int OGRDODSLayer::ProvideDataDDS()
+ bDataLoaded = TRUE;
+ try
+ {
+- poConnection = new AISConnect( poDS->oBaseURL );
++ poConnection = new Connect( poDS->oBaseURL );
+ CPLDebug( "DODS", "request_data(%s,%s)",
+ poDS->oBaseURL.c_str(),
+ (poDS->oProjection + poDS->oConstraints).c_str() );
+--- gdal-1.7.2/frmts/dods/dodsdataset2.cpp.orig 2010-04-24 01:21:55.000000000 +0200
++++ gdal-1.7.2/frmts/dods/dodsdataset2.cpp 2010-10-11 07:24:26.275734339 +0200
+@@ -50,7 +50,7 @@
+ #include <Sequence.h>
+ #include <Grid.h>
+
+-#include <AISConnect.h>
++#include <Connect.h>
+ #include <DDS.h>
+ #include <DAS.h>
+ #include <BaseTypeFactory.h>
+@@ -203,7 +203,7 @@ static int GetDimension( string oCE, con
+ class DODSDataset : public GDALDataset
+ {
+ private:
+- AISConnect *poConnect; //< Virtual connection to the data source
++ Connect *poConnect; //< Virtual connection to the data source
+
+ string oURL; //< data source URL
+ double adfGeoTransform[6];
+@@ -214,7 +214,7 @@ private:
+ DDS *poDDS;
+ BaseTypeFactory *poBaseTypeFactory;
+
+- AISConnect *connect_to_server() throw(Error);
++ Connect *connect_to_server() throw(Error);
+
+ static string SubConstraint( string raw_constraint,
+ string x_constraint,
+@@ -242,7 +242,7 @@ public:
+ static GDALDataset *Open(GDALOpenInfo *);
+
+ /// Return the connection object
+- AISConnect *GetConnect() { return poConnect; }
++ Connect *GetConnect() { return poConnect; }
+
+ /// Return the data source URL
+ string GetUrl() { return oURL; }
+@@ -339,7 +339,7 @@ DODSDataset::~DODSDataset()
+ /* connect_to_server() */
+ /************************************************************************/
+
+-AISConnect *
++Connect *
+ DODSDataset::connect_to_server() throw(Error)
+ {
+ // does the string start with 'http?'
+@@ -375,7 +375,7 @@ DODSDataset::connect_to_server() throw(E
+ /* -------------------------------------------------------------------- */
+ /* Connect, and fetch version information. */
+ /* -------------------------------------------------------------------- */
+- AISConnect *poConnection = new AISConnect(oURL);
++ Connect *poConnection = new Connect(oURL);
+ string version = poConnection->request_version();
+ /* if (version.empty() || version.find("/3.") == string::npos)
+ {
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal.spec?r1=1.76&r2=1.77&f=u
More information about the pld-cvs-commit
mailing list