rpms/gdal/devel gdal-swig.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gdal-buildfix.patch, 1.2, 1.3 gdal.spec, 1.17, 1.18 sources, 1.3, 1.4
Balint Cristian (cbalint)
fedora-extras-commits at redhat.com
Wed Jul 25 11:20:40 UTC 2007
Author: cbalint
Update of /cvs/extras/rpms/gdal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13227/devel
Modified Files:
.cvsignore gdal-buildfix.patch gdal.spec sources
Added Files:
gdal-swig.patch
Log Message:
- new upstream one
- catch some more docs
- fix ogr python module runtime
- include testcases and run tests
- enable geotiff external library we have new libgeotiff now
- EPSG geodetic database is licensed OK since v6.13 so re-enable
- enable it against grass by default, implement optional switches
gdal-swig.patch:
--- NEW FILE gdal-swig.patch ---
diff -urNad gdal-1.4.1~/pymod/GNUmakefile gdal-1.4.1/pymod/GNUmakefile
--- gdal-1.4.1~/pymod/GNUmakefile 2007-04-10 17:15:15.000000000 +0200
+++ gdal-1.4.1/pymod/GNUmakefile 2007-04-30 11:58:10.000000000 +0200
@@ -27,7 +27,7 @@
$(RM) *.o *.$(SO_EXT) *.la
gdal_wrap.c: gdal.i
- -swig -python gdal.i
+# -swig -python gdal.i
$(GDALMODULE_SO): $(OBJ) $(EXE_DEP_LIBS)
$(PY_LD_SHARED) $(OBJ) \
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 9 May 2007 17:58:46 -0000 1.3
+++ .cvsignore 25 Jul 2007 11:20:08 -0000 1.4
@@ -1 +1,2 @@
-gdal-1.4.1-fedora.tar.gz
+gdal-1.4.2-fedora.tar.gz
+gdalautotest-1.4.1.tar.gz
gdal-buildfix.patch:
Index: gdal-buildfix.patch
===================================================================
RCS file: /cvs/extras/rpms/gdal/devel/gdal-buildfix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdal-buildfix.patch 9 May 2007 17:58:46 -0000 1.2
+++ gdal-buildfix.patch 25 Jul 2007 11:20:08 -0000 1.3
@@ -1,38 +1,6 @@
-diff -Nru gdal-1.4.1-fedora/configure gdal-1.4.1-fedora-patched/configure
---- gdal-1.4.1-fedora/configure 2007-04-10 17:16:54.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/configure 2007-05-09 19:37:21.000000000 +0200
-@@ -23371,6 +23371,12 @@
-
- echo "using internal GeoTIFF code."
-
-+elif test "$with_geotiff" = "disabled" ; then
-+
-+ GEOTIFF_SETTING=disabled
-+
-+ echo "disabled GeoTIFF code."
-+
- else
-
- GEOTIFF_SETTING=external
-diff -Nru gdal-1.4.1-fedora/configure.in gdal-1.4.1-fedora-patched/configure.in
---- gdal-1.4.1-fedora/configure.in 2007-04-10 17:16:55.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/configure.in 2007-05-09 19:37:21.000000000 +0200
-@@ -612,6 +612,12 @@
-
- echo "using internal GeoTIFF code."
-
-+elif test "$with_geotiff" = "disabled" ; then
-+
-+ GEOTIFF_SETTING=disabled
-+
-+ echo "disabled GeoTIFF code."
-+
- else
-
- GEOTIFF_SETTING=external
-diff -Nru gdal-1.4.1-fedora/frmts/formats_list.html gdal-1.4.1-fedora-patched/frmts/formats_list.html
---- gdal-1.4.1-fedora/frmts/formats_list.html 2007-04-10 17:16:26.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/frmts/formats_list.html 2007-05-09 19:38:52.000000000 +0200
+diff -Nru gdal-1.4.2-fedora/frmts/formats_list.html gdal-1.4.2-fedora-patched/frmts/formats_list.html
+--- gdal-1.4.2-fedora/frmts/formats_list.html 2007-06-27 20:47:46.000000000 +0200
++++ gdal-1.4.2-fedora-patched/frmts/formats_list.html 2007-07-13 14:22:08.000000000 +0200
@@ -178,13 +178,6 @@
</td><td> 2GiB
</td></tr>
@@ -74,9 +42,9 @@
$Id$
</p>
-diff -Nru gdal-1.4.1-fedora/frmts/gdalallregister.cpp gdal-1.4.1-fedora-patched/frmts/gdalallregister.cpp
---- gdal-1.4.1-fedora/frmts/gdalallregister.cpp 2007-04-10 17:16:26.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/frmts/gdalallregister.cpp 2007-05-09 19:37:21.000000000 +0200
+diff -Nru gdal-1.4.2-fedora/frmts/gdalallregister.cpp gdal-1.4.2-fedora-patched/frmts/gdalallregister.cpp
+--- gdal-1.4.2-fedora/frmts/gdalallregister.cpp 2007-06-27 20:47:46.000000000 +0200
++++ gdal-1.4.2-fedora-patched/frmts/gdalallregister.cpp 2007-07-13 14:22:08.000000000 +0200
@@ -88,10 +88,6 @@
GDALRegister_NITF();
#endif
@@ -88,194 +56,44 @@
#ifdef FRMT_ceos2
GDALRegister_SAR_CEOS();
#endif
-diff -Nru gdal-1.4.1-fedora/frmts/makefile.vc gdal-1.4.1-fedora-patched/frmts/makefile.vc
---- gdal-1.4.1-fedora/frmts/makefile.vc 2007-04-10 17:16:26.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/frmts/makefile.vc 2007-05-09 19:37:21.000000000 +0200
+diff -Nru gdal-1.4.2-fedora/frmts/makefile.vc gdal-1.4.2-fedora-patched/frmts/makefile.vc
+--- gdal-1.4.2-fedora/frmts/makefile.vc 2007-06-27 20:47:46.000000000 +0200
++++ gdal-1.4.2-fedora-patched/frmts/makefile.vc 2007-07-13 14:22:08.000000000 +0200
@@ -1,7 +1,7 @@
GDAL_ROOT = ..
-EXTRAFLAGS = -DFRMT_ceos -DFRMT_aigrid -DFRMT_elas -DFRMT_hfa -DFRMT_gtiff\
-+EXTRAFLAGS = -DFRMT_ceos -DFRMT_aigrid -DFRMT_elas \
++EXTRAFLAGS = -DFRMT_ceos -DFRMT_aigrid -DFRMT_elas -DFRMT_gtiff\
-DFRMT_sdts -DFRMT_raw -DFRMT_gxf -DFRMT_ceos2 -DFRMT_png \
-DFRMT_dted -DFRMT_mem -DFRMT_jdem -DFRMT_gif \
-DFRMT_envisat -DFRMT_aaigrid -DFRMT_usgsdem -DFRMT_l1b \
-diff -Nru gdal-1.4.1-fedora/frmts/mrsid/makefile.vc gdal-1.4.1-fedora-patched/frmts/mrsid/makefile.vc
---- gdal-1.4.1-fedora/frmts/mrsid/makefile.vc 2007-04-10 17:16:25.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/frmts/mrsid/makefile.vc 2007-05-09 19:37:21.000000000 +0200
-@@ -1,7 +1,7 @@
-
- OBJ = mrsiddataset.obj
-
--EXTRAFLAGS = $(MRSID_INCLUDE) -I..\gtiff\libgeotiff $(MRSID_FLAGS)
-+EXTRAFLAGS = $(MRSID_INCLUDE) $(MRSID_FLAGS)
-
- GDAL_ROOT = ..\..
-
-diff -Nru gdal-1.4.1-fedora/gcore/gdaldefaultoverviews.cpp gdal-1.4.1-fedora-patched/gcore/gdaldefaultoverviews.cpp
---- gdal-1.4.1-fedora/gcore/gdaldefaultoverviews.cpp 2007-04-10 17:16:29.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/gcore/gdaldefaultoverviews.cpp 2007-05-09 19:37:21.000000000 +0200
-@@ -327,31 +327,6 @@
- /* produce the imagery. */
- /* -------------------------------------------------------------------- */
-
--#ifndef WIN32CE
--
-- if( bOvrIsAux )
-- {
-- eErr = HFAAuxBuildOverviews( osOvrFilename, poDS, &poODS,
-- nBands, panBandList,
-- nNewOverviews, panNewOverviewList,
-- pszResampling,
-- pfnProgress, pProgressData );
--
-- int j;
--
-- for( j = 0; j < nOverviews; j++ )
-- {
-- if( panOverviewList[j] > 0 )
-- panOverviewList[j] *= -1;
-- }
-- }
--
--/* -------------------------------------------------------------------- */
--/* Build new overviews - TIFF. Close TIFF files while we */
--/* operate on it. */
--/* -------------------------------------------------------------------- */
-- else
--#endif /* WIN32CE */
- {
- if( poODS != NULL )
- {
-@@ -359,10 +334,6 @@
- poODS = NULL;
- }
-
-- eErr = GTIFFBuildOverviews( osOvrFilename, nBands, pahBands,
-- nNewOverviews, panNewOverviewList,
-- pszResampling, pfnProgress, pProgressData );
--
- if( eErr == CE_None )
- {
- poODS = (GDALDataset *) GDALOpen( osOvrFilename, GA_Update );
-diff -Nru gdal-1.4.1-fedora/gcore/gdal_frmts.h gdal-1.4.1-fedora-patched/gcore/gdal_frmts.h
---- gdal-1.4.1-fedora/gcore/gdal_frmts.h 2007-04-10 17:16:29.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/gcore/gdal_frmts.h 2007-05-09 19:37:21.000000000 +0200
-@@ -34,10 +34,8 @@
-
- CPL_C_START
- void CPL_DLL GDALRegister_GDB(void);
--void CPL_DLL GDALRegister_GTiff(void);
+diff -Nru gdal-1.4.2-fedora/gcore/gdal_frmts.h gdal-1.4.2-fedora-patched/gcore/gdal_frmts.h
+--- gdal-1.4.2-fedora/gcore/gdal_frmts.h.orig 2007-07-25 09:44:18.000000000 +0200
++++ gdal-1.4.2-fedora-patched/gcore/gdal_frmts.h 2007-07-25 09:44:28.000000000 +0200
+@@ -37,7 +37,6 @@
+ void CPL_DLL GDALRegister_GTiff(void);
void CPL_DLL GDALRegister_GXF(void);
void CPL_DLL GDALRegister_OGDI(void);
-void CPL_DLL GDALRegister_HFA(void);
void CPL_DLL GDALRegister_AAIGrid(void);
void CPL_DLL GDALRegister_AIGrid(void);
void CPL_DLL GDALRegister_AIGrid2(void);
-diff -Nru gdal-1.4.1-fedora/gcore/gdaljp2metadata.cpp gdal-1.4.1-fedora-patched/gcore/gdaljp2metadata.cpp
---- gdal-1.4.1-fedora/gcore/gdaljp2metadata.cpp 2007-04-10 17:16:29.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/gcore/gdaljp2metadata.cpp 2007-05-09 19:37:21.000000000 +0200
-@@ -45,13 +45,13 @@
- 0xA7,0xAE,0xD6,0x8E,0x34,0x45,0x18,0x09 };
-
- CPL_C_START
--CPLErr CPL_DLL GTIFMemBufFromWkt( const char *pszWKT,
-+/*CPLErr CPL_DLL GTIFMemBufFromWkt( const char *pszWKT,
- const double *padfGeoTransform,
- int nGCPCount, const GDAL_GCP *pasGCPList,
- int *pnSize, unsigned char **ppabyBuffer );
- CPLErr CPL_DLL GTIFWktFromMemBuf( int nSize, unsigned char *pabyBuffer,
- char **ppszWKT, double *padfGeoTransform,
-- int *pnGCPCount, GDAL_GCP **ppasGCPList );
-+ int *pnGCPCount, GDAL_GCP **ppasGCPList );*/
- CPL_C_END
-
- /************************************************************************/
-@@ -296,13 +296,13 @@
- /* -------------------------------------------------------------------- */
- int bSuccess = TRUE;
-
-- if( GTIFWktFromMemBuf( nGeoTIFFSize, pabyGeoTIFFData,
-+/* if( GTIFWktFromMemBuf( nGeoTIFFSize, pabyGeoTIFFData,
- &pszProjection, adfGeoTransform,
- &nGCPCount, &pasGCPList ) != CE_None )
- {
- bSuccess = FALSE;
- }
--
-+*/
- if( pszProjection == NULL || strlen(pszProjection) == 0 )
- bSuccess = FALSE;
-
-@@ -724,9 +724,10 @@
- int nGTBufSize = 0;
- unsigned char *pabyGTBuf = NULL;
-
-- if( GTIFMemBufFromWkt( pszProjection, adfGeoTransform,
-+/* if( GTIFMemBufFromWkt( pszProjection, adfGeoTransform,
- nGCPCount, pasGCPList,
- &nGTBufSize, &pabyGTBuf ) != CE_None )
-+*/
- return NULL;
-
- if( nGTBufSize == 0 )
-diff -Nru gdal-1.4.1-fedora/gcore/gdal_priv.h gdal-1.4.1-fedora-patched/gcore/gdal_priv.h
---- gdal-1.4.1-fedora/gcore/gdal_priv.h 2007-04-10 17:16:29.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/gcore/gdal_priv.h 2007-05-09 19:37:21.000000000 +0200
-@@ -612,26 +612,6 @@
-
- CPL_C_START
-
--#ifndef WIN32CE
--
--CPLErr CPL_DLL
--HFAAuxBuildOverviews( const char *pszOvrFilename, GDALDataset *poParentDS,
-- GDALDataset **ppoDS,
-- int nBands, int *panBandList,
-- int nNewOverviews, int *panNewOverviewList,
-- const char *pszResampling,
-- GDALProgressFunc pfnProgress,
-- void *pProgressData );
--
--#endif /* WIN32CE */
--
--CPLErr CPL_DLL
--GTIFFBuildOverviews( const char * pszFilename,
-- int nBands, GDALRasterBand **papoBandList,
-- int nOverviews, int * panOverviewList,
-- const char * pszResampling,
-- GDALProgressFunc pfnProgress, void * pProgressData );
--
- CPLErr CPL_DLL
- GDALDefaultBuildOverviews( GDALDataset *hSrcDS, const char * pszBasename,
- const char * pszResampling,
-diff -Nru gdal-1.4.1-fedora/GDALmake.opt.in gdal-1.4.1-fedora-patched/GDALmake.opt.in
---- gdal-1.4.1-fedora/GDALmake.opt.in 2007-04-10 17:16:55.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/GDALmake.opt.in 2007-05-09 19:37:21.000000000 +0200
-@@ -311,7 +311,7 @@
+diff -Nru gdal-1.4.2-fedora/GDALmake.opt.in gdal-1.4.2-fedora-patched/GDALmake.opt.in
+--- gdal-1.4.2-fedora/GDALmake.opt.in 2007-06-27 20:48:17.000000000 +0200
++++ gdal-1.4.2-fedora-patched/GDALmake.opt.in 2007-07-13 14:22:08.000000000 +0200
+@@ -312,7 +312,7 @@
# and their uppercase form should be the format portion of the
# format registration entry point. eg. gdb -> GDALRegister_GDB().
#
-GDAL_FORMATS = gxf gtiff hfa aigrid aaigrid ceos ceos2 iso8211 xpm \
-+GDAL_FORMATS = gxf aigrid aaigrid ceos ceos2 iso8211 xpm \
++GDAL_FORMATS = gxf gtiff aigrid aaigrid ceos ceos2 iso8211 xpm \
sdts raw dted mem jdem envisat elas fit vrt usgsdem l1b \
nitf bmp pcidsk airsar rs2 ilwis rmf rik leveller sgi \
idrisi \
-diff -Nru gdal-1.4.1-fedora/ogr/Makefile gdal-1.4.1-fedora-patched/ogr/Makefile
---- gdal-1.4.1-fedora/ogr/Makefile 2007-04-10 17:15:09.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/ogr/Makefile 2007-05-09 19:37:21.000000000 +0200
-@@ -2,7 +2,7 @@
- LINKFLAGS = /Zi /MTd
- EXTRAFLAGS = -I$(MSDASDK)\inc \
- -I"$(VCDIR)\ATL\Include" -DWIN32 \
-- -I. -Iogrsf_frmts -I..\frmts\gtiff\libgeotiff \
-+ -I. -Iogrsf_frmts \
- $(PROJ_FLAGS) $(PROJ_INCLUDE) $(GEOS_CFLAGS)
-
- GDAL_ROOT = ..
-diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
---- gdal-1.4.1-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp 2007-04-10 17:14:53.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp 2007-05-09 19:37:21.000000000 +0200
+diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
+--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/generic/ogrregisterall.cpp 2007-06-27 20:46:10.000000000 +0200
++++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/generic/ogrregisterall.cpp 2007-07-13 14:22:08.000000000 +0200
@@ -57,9 +57,6 @@
#ifdef S57_ENABLED
RegisterOGRS57();
@@ -297,9 +115,9 @@
#ifdef SQLITE_ENABLED
RegisterOGRSQLite();
#endif
-diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/GNUmakefile gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/GNUmakefile
---- gdal-1.4.1-fedora/ogr/ogrsf_frmts/GNUmakefile 2007-04-10 17:15:02.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/GNUmakefile 2007-05-09 19:37:21.000000000 +0200
+diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/GNUmakefile gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/GNUmakefile
+--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/GNUmakefile 2007-06-27 20:46:19.000000000 +0200
++++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/GNUmakefile 2007-07-13 14:22:08.000000000 +0200
@@ -1,7 +1,7 @@
include ../../GDALmake.opt
@@ -317,9 +135,9 @@
SUBDIRS-$(HAVE_DWGDIRECT) += dxfdwg
SUBDIRS-$(HAVE_SDE) += sde
SUBDIRS-$(HAVE_IDB) += idb
-diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/Makefile gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/Makefile
---- gdal-1.4.1-fedora/ogr/ogrsf_frmts/Makefile 2007-04-10 17:15:02.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/Makefile 2007-05-09 19:37:21.000000000 +0200
+diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/Makefile gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/Makefile
+--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/Makefile 2007-06-27 20:46:19.000000000 +0200
++++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/Makefile 2007-07-13 14:22:08.000000000 +0200
@@ -1,6 +1,6 @@
GDAL_ROOT = ..\..
@@ -349,9 +167,9 @@
vrt\*.obj csv\*.obj rec\*.obj kml\*.obj \
$(OGDIOBJ) $(ODBCOBJ) $(SQLITE_OBJ) \
$(FMEOBJ) $(OCIOBJ) $(PG_OBJ) $(MYSQL_OBJ) \
-diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogr_formats.html gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html
---- gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogr_formats.html 2007-04-10 17:15:02.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html 2007-05-09 19:37:21.000000000 +0200
+diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogr_formats.html gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html
+--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogr_formats.html 2007-06-27 20:46:18.000000000 +0200
++++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogr_formats.html 2007-07-13 14:22:08.000000000 +0200
@@ -85,11 +85,6 @@
</td><td> Yes
</td></tr>
@@ -364,9 +182,9 @@
<tr><td> <a href="drv_mysql.html">MySQL</a>
</td><td> No
</td><td> No
-diff -Nru gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h
---- gdal-1.4.1-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h 2007-04-10 17:15:02.000000000 +0200
-+++ gdal-1.4.1-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h 2007-05-09 19:37:21.000000000 +0200
+diff -Nru gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h
+--- gdal-1.4.2-fedora/ogr/ogrsf_frmts/ogrsf_frmts.h 2007-06-27 20:46:19.000000000 +0200
++++ gdal-1.4.2-fedora-patched/ogr/ogrsf_frmts/ogrsf_frmts.h 2007-07-13 14:22:08.000000000 +0200
@@ -310,7 +310,6 @@
void CPL_DLL RegisterOGRPG();
void CPL_DLL RegisterOGRMySQL();
@@ -384,3 +202,37 @@
void CPL_DLL RegisterOGRGRASS();
void CPL_DLL RegisterOGRPGeo();
void CPL_DLL RegisterOGRDXFDWG();
+--- gdal-1.4.2-fedora/gcore/gdaldefaultoverviews.cpp.orig 2007-06-27 20:47:49.000000000 +0200
++++ gdal-1.4.2-fedora-patched/gcore/gdaldefaultoverviews.cpp 2007-07-25 10:11:26.000000000 +0200
+@@ -327,31 +327,6 @@
+ /* produce the imagery. */
+ /* -------------------------------------------------------------------- */
+
+-#ifndef WIN32CE
+-
+- if( bOvrIsAux )
+- {
+- eErr = HFAAuxBuildOverviews( osOvrFilename, poDS, &poODS,
+- nBands, panBandList,
+- nNewOverviews, panNewOverviewList,
+- pszResampling,
+- pfnProgress, pProgressData );
+-
+- int j;
+-
+- for( j = 0; j < nOverviews; j++ )
+- {
+- if( panOverviewList[j] > 0 )
+- panOverviewList[j] *= -1;
+- }
+- }
+-
+-/* -------------------------------------------------------------------- */
+-/* Build new overviews - TIFF. Close TIFF files while we */
+-/* operate on it. */
+-/* -------------------------------------------------------------------- */
+- else
+-#endif /* WIN32CE */
+ {
+ if( poODS != NULL )
+ {
Index: gdal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gdal.spec 5 Jun 2007 10:49:32 -0000 1.17
+++ gdal.spec 25 Jul 2007 11:20:08 -0000 1.18
@@ -1,23 +1,33 @@
Name: gdal
-Version: 1.4.1
-Release: 4%{?dist}
+Version: 1.4.2
+Release: 1%{?dist}
Summary: GIS file format library
Group: System Environment/Libraries
License: MIT
URL: http://gdal.maptools.org
-Source: %{name}-%{version}-fedora.tar.gz
+Source0: %{name}-%{version}-fedora.tar.gz
+Source1: http://download.osgeo.org/gdal/gdalautotest-1.4.1.tar.gz
Patch0: %{name}-buildfix.patch
+Patch1: %{name}-swig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool swig pkgconfig
BuildRequires: doxygen tetex-latex ghostscript
BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel
BuildRequires: jasper-devel cfitsio-devel hdf-devel libdap-devel librx-devel
BuildRequires: unixODBC-devel mysql-devel sqlite-devel postgresql-devel zlib-devel
-BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel
+BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel libgeotiff-devel
BuildRequires: python-devel >= 2.4 xerces-c-devel
BuildRequires: perl(ExtUtils::MakeMaker)
+# build against grass by default
+%define _with_grass 1
+
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+%define grass_support %{?_with_grass:1}%{!?_with_grass:%{?_without_grass:0}%{!?_without_grass:%{?_grass_support:%{_grass}}%{!?_grass:0}}}
+
+%if %{grass_support}
+BuildRequires: grass-devel
+%endif
%description
The GDAL library provides support to handle multiple GIS file formats.
@@ -26,6 +36,7 @@
Summary: Development Libraries for the GDAL file format library
Group: Development/Libraries
Requires: pkgconfig
+Requires: libgeotiff-devel
Requires: %{name} = %{version}-%{release}
%description devel
@@ -50,6 +61,10 @@
%prep
%setup -q -n %{name}-%{version}-fedora
%patch0 -p1 -b .buildfix
+%patch1 -p1 -b .swig
+
+# unpack test cases olso.
+tar -xzf %{SOURCE1} .
# fix wrongly encoded files from tarball
set +x
@@ -90,6 +105,7 @@
sed -i 's|-L\$with_jpeg -L\$with_jpeg\/lib -ljpeg|-ljpeg|g' configure
sed -i 's|-L\$with_libtiff\/lib -ltiff|-ltiff|g' configure
sed -i 's|-L\$with_grass\/lib||g' configure
+sed -i 's|-lgeotiff -L$with_geotiff $LIBS|-lgeotiff $LIBS|g' configure
sed -i 's|-logdi31|-logdi|g' configure
# fix python path for ppc64
@@ -99,6 +115,7 @@
export CPPFLAGS="`pkg-config ogdi --cflags`"
export CPPFLAGS="$CPPFLAGS -I%{_includedir}/netcdf-3"
export CPPFLAGS="$CPPFLAGS -I%{_includedir}/hdf"
+export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libgeotiff"
export CPPFLAGS="$CPPFLAGS `dap-config --cflags`"
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
@@ -111,7 +128,7 @@
--with-dods-root=%{_libdir} \
--with-ogdi=`ogdi-config --libdir` \
--with-cfitsio=%{_prefix} \
- --with-geotiff=disabled \
+ --with-geotiff=external \
--with-tiff=external \
--with-libtiff=external \
--with-libz \
@@ -134,9 +151,11 @@
--with-xerces-inc=%{_includedir} \
--without-pcraster \
--enable-shared \
+%if %{grass_support}
+ --with-libgrass \
+ --with-grass=%{_prefix} \
--disable-static
-# --with-libgrass \
-# --with-grass=%{_prefix} \
+%endif
# fixup hardcoded wrong compile flags.
cp GDALmake.opt GDALmake.opt.orig
@@ -214,7 +233,7 @@
mkdir -p doc/ogrsf_frmts; find ogr/ogrsf_frmts -name "*.html" -exec install -m 644 '{}' doc/ogrsf_frmts \;
# some commented out are broken for now
-#pushd doc; doxygen index.dox; popd
+pushd doc; doxygen *.dox; popd
pushd rfc; doxygen *.dox; popd
pushd rfc/latex; make refman.pdf; popd
#pushd ogr/ogrsf_frmts; doxygen *.dox; popd
@@ -224,9 +243,33 @@
# cleanup junks
for junk in {*.a,*.la,*.bs,.exists,.packlist,.cvsignore} ; do
-find ${RPM_BUILD_ROOT} -name "$junk" -exec rm -rf '{}' \;
+find %{buildroot} -name "$junk" -exec rm -rf '{}' \;
done
+%check
+
+pushd gdalautotest-1.4.1
+
+# export test enviroment
+export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitearch}
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH%{buildroot}%{_libdir}
+export GDAL_DATA=%{buildroot}%{_datadir}/%{name}/
+
+# remove some testcases for now due to build failure
+rm -rf ogr/ogr_pg.py # no pgsql during test (disabled)
+rm -rf ogr/ogr_dods.py # no dots during test (disabled)
+rm -rf gdrivers/dods.py # no dots during test (disabled)
+rm -rf gcore/hfa_write.py # HFA driver absent (disabled)
+rm -rf ogr/ogr_dgn.py # DGW driver absent (disabled)
+rm -rf osr/osr_esri.py # ESRI datum absent (disabled)
+
+rm -rf gcore/tiff_write.py # crash ugly on 64bit (mustfix)
+
+# run tests but force than normal exit
+./run_all.py || exit 0
+
+popd
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -289,6 +332,15 @@
%{perl_vendorarch}/*
%changelog
+* Wed Jul 24 2007 Balint Cristian <cbalint at redhat.com> 1.4.2-1
+- new upstream one
+- catch some more docs
+- fix ogr python module runtime
+- include testcases and run tests
+- enable geotiff external library we have new libgeotiff now
+- EPSG geodetic database is licensed OK since v6.13 so re-enable
+- enable it against grass by default, implement optional switches
+
* Tue Jun 05 2007 Balint Cristian <cbalint at redhat.com> 1.4.1-4
- re-build.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 9 May 2007 17:58:46 -0000 1.3
+++ sources 25 Jul 2007 11:20:08 -0000 1.4
@@ -1 +1,2 @@
-0cdfc9f365371ea1dbff3b1349197084 gdal-1.4.1-fedora.tar.gz
+9ef2d4a6c0325569ef4e40e416760d62 gdal-1.4.2-fedora.tar.gz
+f33218127eefdc89369cf4e984f169c5 gdalautotest-1.4.1.tar.gz
More information about the scm-commits
mailing list