diff --git a/.cvsignore b/.cvsignore index 2b38ea8..17fc290 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ -gdal-1.6.2.tar.gz -gdal-1.6.2-fedora.tar.gz -gdalautotest-1.6.0.tar.gz +gdal-1.7.1-fedora.tar.gz +gdalautotest-1.7.0.tar.gz diff --git a/gdal-dods.patch b/gdal-dods.patch deleted file mode 100644 index 751b38c..0000000 --- a/gdal-dods.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- 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" ); - - if( poFileInfo == NULL ) - { -- poFileInfo = oDAS.find_container( "NC_GLOBAL" ); -+ poFileInfo = oDAS.container()->find_container( "NC_GLOBAL" ); - - if( poFileInfo == NULL ) - { -- poFileInfo = oDAS.find_container( "HDF_GLOBAL" ); -+ poFileInfo = oDAS.container()->find_container( "HDF_GLOBAL" ); - - 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.0-fedora/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp.dods~ 2007-01-18 03:22:39.000000000 +0100 -+++ gdal-1.6.0-fedora/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp 2009-07-30 09:39:21.000000000 +0200 -@@ -193,12 +193,12 @@ int OGRDODSDataSource::Open( const char - /* -------------------------------------------------------------------- */ - 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.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() ); - diff --git a/gdal.spec b/gdal.spec index 9d679e0..8772de9 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,6 +1,6 @@ Name: gdal -Version: 1.6.2 -Release: 5%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -8,11 +8,10 @@ URL: http://www.gdal.org/ #Source0: http://download.osgeo.org/gdal/gdal-%{version}.tar.gz # see PROVENANCE.TXT-fedora for details Source0: %{name}-%{version}-fedora.tar.gz -Source1: http://download.osgeo.org/gdal/gdalautotest-1.6.0.tar.gz +Source1: http://download.osgeo.org/gdal/gdalautotest-1.7.0.tar.gz Patch0: %{name}-libdap.patch Patch1: %{name}-mysql.patch Patch2: %{name}-bindir.patch -Patch3: %{name}-dods.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool pkgconfig BuildRequires: python-devel numpy xerces-c-devel @@ -29,7 +28,7 @@ BuildRequires: ant swig ruby java-devel-gcj %endif # enable/disable grass support, for bootstrapping -%define grass_support 1 +%define grass_support 0 # enable/disable refman generation %define build_refman 1 @@ -111,7 +110,6 @@ The GDAL java modules provides support to handle multiple GIS file formats. %endif %patch1 -p0 -b .mysql~ %patch2 -p1 -b .bindir~ -%patch3 -p1 -b .dods~ # unpack test cases olso. tar -xzf %{SOURCE1} @@ -142,13 +140,6 @@ set -x find . -name ".cvsignore" -exec rm -rf '{}' \; # fix some exec bits -chmod -x alg/gdal_tps.cpp -chmod -x apps/nearblack.cpp -chmod -x frmts/jpeg/gdalexif.h -chmod -x ogr/ogrsf_frmts/ogdi/ogrogdi.h -chmod -x ogr/ogrsf_frmts/ogdi/ogrogdilayer.cpp -chmod -x ogr/ogrsf_frmts/ogdi/ogrogdidatasource.cpp -chmod -x ogr/ogrsf_frmts/ogdi/ogrogdidriver.cpp find swig/python/samples -name "*.py" -exec chmod -x '{}' \; %build @@ -190,7 +181,7 @@ export CFLAGS=`echo %{optflags}|sed -e 's/\-Wp\,\-D_FORTIFY_SOURCE\=2 / -fPIC -D --datadir=%{_datadir}/%{name}/ \ --with-threads \ --with-dods-root=%{_libdir} \ - --with-ogdi=`ogdi-config --libdir` \ + --with-ogdi \ --with-cfitsio=%{_prefix} \ --with-geotiff=external \ --with-tiff=external \ @@ -218,11 +209,13 @@ export CFLAGS=`echo %{optflags}|sed -e 's/\-Wp\,\-D_FORTIFY_SOURCE\=2 / -fPIC -D --with-xerces-lib='-lxerces-c' \ --with-xerces-inc=%{_includedir} \ --without-pcraster \ + --with-jpeg12=no \ --enable-shared \ %if %{grass_support} --with-libgrass \ --with-grass=%{_prefix} \ %endif + --with-gdal-ver=%{version}-fedora # fixup hardcoded wrong compile flags. cp GDALmake.opt GDALmake.opt.orig @@ -261,8 +254,6 @@ sed -i -e 's|-cp|\#-cp|g' GNUmakefile sed -i -e 's|\$(LD) -shared \$(LDFLAGS) \$(CONFIG_LIBS)|g++ -shared -lgdal -L..\/..\/.libs|g' GNUmakefile # build java module make generate -# disable ColorEntry for now (gdal Ticket: #2331) -rm -rf org/gdal/gdal/ColorTable.java make build popd %endif @@ -337,6 +328,7 @@ find %{buildroot}%{python_sitearch} -name "*.so" -exec chmod 755 '{}' \; # install and include all docs # due TeX-related issues some refman.pdf are not created rm -rf docs doc/docs-perl + mkdir -p doc/gdal_frmts; find frmts -name "*.html" -exec install -p -m 644 '{}' doc/gdal_frmts/ \; mkdir -p doc/ogrsf_frmts; find ogr -name "*.html" -exec install -p -m 644 '{}' doc/ogrsf_frmts/ \; %if %{build_refman} @@ -424,17 +416,18 @@ touch -r NEWS %{buildroot}%{_bindir}/%{name}-config # cleanup junks rm -rf %{buildroot}%{_includedir}/%{name}/%{name} rm -rf %{buildroot}%{_bindir}/gdal_sieve.dox +rm -rf %{buildroot}%{_bindir}/gdal_fillnodata.dox for junk in {*.la,*.bs,.exists,.packlist,.cvsignore} ; do find %{buildroot} -name "$junk" -exec rm -rf '{}' \; done %check -pushd gdalautotest-1.6.0 +pushd gdalautotest-1.7.0 # export test enviroment export PYTHONPATH=$PYTHONPATH:%{buildroot}%{python_sitearch} -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH%{buildroot}%{_libdir} +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir} export GDAL_DATA=%{buildroot}%{_datadir}/%{name}/ # remove some testcases for now due to build failure @@ -466,6 +459,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/gdal_translate %{_bindir}/gdaladdo %{_bindir}/gdalinfo +%{_bindir}/gdaldem %{_bindir}/gdalbuildvrt %{_bindir}/gdaltindex %{_bindir}/gdalwarp @@ -479,20 +473,20 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so.* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* -%{_mandir}/man1/gdaladdo.1* -%{_mandir}/man1/gdalbuildvrt.1* -%{_mandir}/man1/gdalinfo.1* -%{_mandir}/man1/gdaltindex.1* -%{_mandir}/man1/gdaltransform.1* -%{_mandir}/man1/gdal2tiles.1* -%{_mandir}/man1/nearblack.1* -%{_mandir}/man1/gdal_contour.1* -%{_mandir}/man1/gdal_rasterize.1* -%{_mandir}/man1/gdal_translate.1* -%{_mandir}/man1/gdal_utilities.1* -%{_mandir}/man1/gdal_grid.1* -%{_mandir}/man1/gdal_retile.1* -%{_mandir}/man1/ogr*.1* +#%{_mandir}/man1/gdaladdo.1* +#%{_mandir}/man1/gdalbuildvrt.1* +#%{_mandir}/man1/gdalinfo.1* +#%{_mandir}/man1/gdaltindex.1* +#%{_mandir}/man1/gdaltransform.1* +#%{_mandir}/man1/gdal2tiles.1* +#%{_mandir}/man1/nearblack.1* +#%{_mandir}/man1/gdal_contour.1* +#%{_mandir}/man1/gdal_rasterize.1* +#%{_mandir}/man1/gdal_translate.1* +#%{_mandir}/man1/gdal_utilities.1* +#%{_mandir}/man1/gdal_grid.1* +#%{_mandir}/man1/gdal_retile.1* +#%{_mandir}/man1/ogr*.1* %files devel %defattr(-,root,root,-) @@ -503,7 +497,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/%{name}/*.h %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc -%{_mandir}/man1/%{name}-config* +#%{_mandir}/man1/%{name}-config* %files static %defattr(-,root,root,-) @@ -514,9 +508,9 @@ rm -rf $RPM_BUILD_ROOT %doc swig/python/samples %attr(0755,root,root) %{_bindir}/*.py %{python_sitearch}/* -%{_mandir}/man1/pct2rgb.1* -%{_mandir}/man1/rgb2pct.1* -%{_mandir}/man1/gdal_merge.1* +#%{_mandir}/man1/pct2rgb.1* +#%{_mandir}/man1/rgb2pct.1* +#%{_mandir}/man1/gdal_merge.1* %files perl %defattr(-,root,root,-) @@ -539,6 +533,13 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Mar 18 2010 Balint Cristian - 1.7.1-1 +- new stable branch +- re-enable java ColorTable +- gdal custom fedora version banner +- rebuild without grass +- gdal manual are gone (upstream fault) + * Fri Feb 5 2010 Kevin Kofler - 1.6.2-5 - reenable grass support diff --git a/import.log b/import.log index 56c45af..fcbbaf5 100644 --- a/import.log +++ b/import.log @@ -7,3 +7,4 @@ gdal-1_6_0-1_fc11:HEAD:gdal-1.6.0-1.fc11.src.rpm:1229050992 gdal-1_6_0-2_fc11:HEAD:gdal-1.6.0-2.fc11.src.rpm:1233238875 gdal-1_6_0-3_fc11:HEAD:gdal-1.6.0-3.fc11.src.rpm:1233609041 gdal-1_6_0-4_fc11:HEAD:gdal-1.6.0-4.fc11.src.rpm:1233754182 +gdal-1_7_1-1_fc13:HEAD:gdal-1.7.1-1.fc13.src.rpm:1268888938 diff --git a/sources b/sources index bce1c15..a1fd207 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -f2dcd6aa7222d021202984523adf3b55 gdal-1.6.2.tar.gz -a5c60f9d1bb97eabe4e681a762fb19dc gdal-1.6.2-fedora.tar.gz -8ca6f8b83e0afb7a79040ac19c5b0b76 gdalautotest-1.6.0.tar.gz +0fff6cdb8ee5a6025ca9d7222ad44ba0 gdal-1.7.1-fedora.tar.gz +a952e4070066c04f9b2767bd1aaeda26 gdalautotest-1.7.0.tar.gz