Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Fedora Release Engineering | ca59338161 | |
Balint Cristian | 0294df5225 | |
Bill Nottingham | 7b4facbabe | |
Jesse Keating | 8dc0ba149e |
|
@ -1,2 +1,2 @@
|
|||
gdal-1.6.0-fedora.tar.gz
|
||||
gdalautotest-1.6.0.tar.gz
|
||||
gdal-1.6.2-fedora.tar.gz
|
21
Makefile
21
Makefile
|
@ -1,21 +0,0 @@
|
|||
# Makefile for source rpm: gdal
|
||||
# $Id$
|
||||
NAME := gdal
|
||||
SPECFILE = $(firstword $(wildcard *.spec))
|
||||
|
||||
define find-makefile-common
|
||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||
|
||||
ifeq ($(MAKEFILE_COMMON),)
|
||||
# attept a checkout
|
||||
define checkout-makefile-common
|
||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||
endef
|
||||
|
||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||
endif
|
||||
|
||||
include $(MAKEFILE_COMMON)
|
|
@ -0,0 +1,48 @@
|
|||
--- 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() );
|
||||
|
94
gdal.spec
94
gdal.spec
|
@ -1,21 +1,25 @@
|
|||
Name: gdal
|
||||
Version: 1.6.0
|
||||
Release: 8%{?dist}
|
||||
Version: 1.6.2
|
||||
Release: 6%{?dist}
|
||||
Summary: GIS file format library
|
||||
Group: System Environment/Libraries
|
||||
License: MIT
|
||||
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
|
||||
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
|
||||
BuildRequires: libpng-devel libungif-devel libjpeg-devel libtiff-devel
|
||||
BuildRequires: doxygen tetex-latex ghostscript ruby-devel jpackage-utils
|
||||
BuildRequires: jasper-devel cfitsio-devel hdf-devel libdap-devel librx-devel
|
||||
BuildRequires: jasper-devel cfitsio-devel libdap-devel librx-devel
|
||||
BuildRequires: hdf-static hdf-devel
|
||||
BuildRequires: unixODBC-devel mysql-devel sqlite-devel postgresql-devel zlib-devel
|
||||
BuildRequires: proj-devel geos-devel netcdf-devel hdf5-devel ogdi-devel libgeotiff-devel
|
||||
BuildRequires: perl(ExtUtils::MakeMaker)
|
||||
|
@ -107,6 +111,7 @@ 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}
|
||||
|
@ -162,6 +167,7 @@ sed -i 's|-lgeotiff -L$with_geotiff $LIBS|-lgeotiff $LIBS|g' configure
|
|||
sed -i 's|-L\$with_geotiff\/lib -lgeotiff $LIBS|-lgeotiff $LIBS|g' configure
|
||||
sed -i 's|-lmfhdf -ldf|-L$libdir/hdf -lmfhdf -ldf|g' configure
|
||||
sed -i 's|-logdi31|-logdi|g' configure
|
||||
sed -i 's|libproj.so|libproj.so.0|g' ogr/ogrct.cpp
|
||||
|
||||
# fix python path for ppc64
|
||||
sed -i 's|test \"$ARCH\" = \"x86_64\"|test \"$libdir\" = \"\/usr\/lib64\"|g' configure
|
||||
|
@ -330,6 +336,7 @@ find %{buildroot}%{perl_vendorarch} -name "*.so" -exec chmod 755 '{}' \;
|
|||
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/ \;
|
||||
|
@ -339,15 +346,15 @@ pushd docs/docs-%{cpuarch}/pdf; mkdir -p br ru en ogr ogrsf_frmts/dgn frmts/gxf
|
|||
install -p -m 644 doc/latex/refman.pdf docs/docs-%{cpuarch}/pdf/en
|
||||
install -p -m 644 doc/br/latex/refman.pdf docs/docs-%{cpuarch}/pdf/br/
|
||||
#install -p -m 644 doc/ru/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ru/
|
||||
install -p -m 644 latex/refman.pdf docs/docs-%{cpuarch}/refman.pdf
|
||||
install -p -m 644 ogr/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogr/
|
||||
#install -p -m 644 latex/refman.pdf docs/docs-%{cpuarch}/refman.pdf
|
||||
#install -p -m 644 ogr/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogr/
|
||||
install -p -m 644 ogr/ogrsf_frmts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/
|
||||
install -p -m 644 ogr/ogrsf_frmts/dgn/latex/refman.pdf docs/docs-%{cpuarch}/pdf/ogrsf_frmts/dgn/
|
||||
%if "%{?dist}" != ".el4"
|
||||
# broken on el4
|
||||
install -p -m 644 frmts/gxf/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/gxf/
|
||||
%endif
|
||||
install -p -m 644 frmts/sdts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/sdts/
|
||||
#install -p -m 644 frmts/sdts/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/sdts/
|
||||
install -p -m 644 frmts/iso8211/latex/refman.pdf docs/docs-%{cpuarch}/pdf/frmts/iso8211/
|
||||
mkdir -p doc/docs-perl/docs-%{cpuarch}/pdf
|
||||
install -p -m 644 swig/perl/latex/refman.pdf doc/docs-perl/docs-%{cpuarch}/pdf
|
||||
|
@ -453,13 +460,14 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc NEWS PROVENANCE.TXT-mainstream PROVENANCE.TXT-fedora COMMITERS
|
||||
%doc NEWS PROVENANCE.TXT PROVENANCE.TXT-fedora COMMITERS
|
||||
%doc docs/
|
||||
%{_bindir}/gdal_contour
|
||||
%{_bindir}/gdal_rasterize
|
||||
%{_bindir}/gdal_translate
|
||||
%{_bindir}/gdaladdo
|
||||
%{_bindir}/gdalinfo
|
||||
%{_bindir}/gdalbuildvrt
|
||||
%{_bindir}/gdaltindex
|
||||
%{_bindir}/gdalwarp
|
||||
%{_bindir}/gdal_grid
|
||||
|
@ -472,19 +480,20 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_libdir}/*.so.*
|
||||
%dir %{_datadir}/%{name}
|
||||
%{_datadir}/%{name}/*
|
||||
%{_mandir}/man1/gdaladdo.1.gz
|
||||
%{_mandir}/man1/gdalinfo.1.gz
|
||||
%{_mandir}/man1/gdaltindex.1.gz
|
||||
%{_mandir}/man1/gdaltransform.1.gz
|
||||
%{_mandir}/man1/gdal2tiles.1.gz
|
||||
%{_mandir}/man1/nearblack.1.gz
|
||||
%{_mandir}/man1/gdal_contour.1.gz
|
||||
%{_mandir}/man1/gdal_rasterize.1.gz
|
||||
%{_mandir}/man1/gdal_translate.1.gz
|
||||
%{_mandir}/man1/gdal_utilities.1.gz
|
||||
%{_mandir}/man1/gdal_grid.1.gz
|
||||
%{_mandir}/man1/gdal_retile.1.gz
|
||||
%{_mandir}/man1/ogr*.1.gz
|
||||
%{_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,-)
|
||||
|
@ -504,11 +513,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%files python
|
||||
%defattr(-,root,root,-)
|
||||
%doc swig/python/samples
|
||||
%attr(0755,root,root) %{_bindir}/*
|
||||
%attr(0755,root,root) %{_bindir}/*.py
|
||||
%{python_sitearch}/*
|
||||
%{_mandir}/man1/pct2rgb.1.gz
|
||||
%{_mandir}/man1/rgb2pct.1.gz
|
||||
%{_mandir}/man1/gdal_merge.1.gz
|
||||
%{_mandir}/man1/pct2rgb.1*
|
||||
%{_mandir}/man1/rgb2pct.1*
|
||||
%{_mandir}/man1/gdal_merge.1*
|
||||
|
||||
%files perl
|
||||
%defattr(-,root,root,-)
|
||||
|
@ -531,6 +540,43 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Mar 18 2010 Balint Cristian <cristian.balint@gmail.com> - 1.6.2.6
|
||||
- fix bz#572617
|
||||
|
||||
* Fri Feb 5 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.6.2-5
|
||||
- reenable grass support
|
||||
|
||||
* Fri Feb 5 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.6.2-4
|
||||
- temporarily disable grass support for bootstrapping
|
||||
- rebuild for new libxerces-c
|
||||
|
||||
* Tue Dec 8 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 1.6.2-3
|
||||
- Explicitly BR hdf-static in accordance with the Packaging
|
||||
Guidelines (hdf-devel is still static-only).
|
||||
|
||||
* Thu Nov 19 2009 Orion Poplawski <orion@cora.nwra.com> - 1.6.2-2
|
||||
- re-enable grass support
|
||||
|
||||
* Tue Nov 17 2009 Orion Poplawski <orion@cora.nwra.com> - 1.6.2-1
|
||||
- Update to 1.6.2
|
||||
- Rebuild for netcdf 4.1.0
|
||||
|
||||
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.6.1-2
|
||||
- rebuilt with new openssl
|
||||
|
||||
* Thu Jul 30 2009 Dan Horak <dan[at]danny.cz> - 1.6.1-1
|
||||
- add patch for incompatibilities caused by libdap 3.9.x (thanks goes to arekm from PLD)
|
||||
- update to 1.6.1
|
||||
- don't install some refman.pdf, because they don't build
|
||||
- don't fail on man pages with suffix other than .gz
|
||||
- fix filelist for python subpackage
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.0-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Wed Jul 22 2009 Orion Poplawski <orion@cora.nwra.com> - 1.6.0-9
|
||||
- Rebuild for libdap 3.9.3, bootstrap
|
||||
|
||||
* Mon Mar 23 2009 Jesse Keating <jkeating@redhat.com> - 1.6.0-8
|
||||
- re-enable grass support
|
||||
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
gdal-1_5_2-1_fc9:HEAD:gdal-1.5.2-1.fc9.src.rpm:1213299145
|
||||
gdal-1_5_2-4_fc10:HEAD:gdal-1.5.2-4.fc10.src.rpm:1222777883
|
||||
gdal-1_5_3-1_fc10:HEAD:gdal-1.5.3-1.fc10.src.rpm:1224848682
|
||||
gdal-1_6_0-0_1_rc4_fc11:HEAD:gdal-1.6.0-0.1.rc4.fc11.src.rpm:1228594658
|
||||
gdal-1_6_0-0_2_rc4_fc11:HEAD:gdal-1.6.0-0.2.rc4.fc11.src.rpm:1228602531
|
||||
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
|
Loading…
Reference in New Issue