rpms/gdal/devel gdal-dods.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 gdal.spec, 1.66, 1.67 sources, 1.13, 1.14
Dan Horák
sharkcz at fedoraproject.org
Thu Jul 30 10:14:24 UTC 2009
Author: sharkcz
Update of /cvs/pkgs/rpms/gdal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28784
Modified Files:
.cvsignore gdal.spec sources
Added Files:
gdal-dods.patch
Log Message:
* 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
gdal-dods.patch:
gdal-1.6.0-fedora/ogr/ogrsf_frmts/dods/ogrdodsdatasource.cpp | 6 +++---
gdal-1.6.1/frmts/dods/dodsdataset2.cpp | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
--- NEW FILE gdal-dods.patch ---
--- 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() );
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore 29 Jan 2009 14:21:56 -0000 1.13
+++ .cvsignore 30 Jul 2009 10:14:23 -0000 1.14
@@ -1,2 +1,2 @@
-gdal-1.6.0-fedora.tar.gz
+gdal-1.6.1-fedora.tar.gz
gdalautotest-1.6.0.tar.gz
Index: gdal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/gdal.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- gdal.spec 24 Jul 2009 23:39:09 -0000 1.66
+++ gdal.spec 30 Jul 2009 10:14:24 -0000 1.67
@@ -1,15 +1,17 @@
Name: gdal
-Version: 1.6.0
-Release: 10%{?dist}
+Version: 1.6.1
+Release: 1%{?dist}
Summary: GIS file format library
Group: System Environment/Libraries
License: MIT
URL: http://www.gdal.org/
+# 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
@@ -107,6 +109,7 @@ The GDAL java modules provides support t
%endif
%patch1 -p0 -b .mysql~
%patch2 -p1 -b .bindir~
+%patch3 -p1 -b .dods~
# unpack test cases olso.
tar -xzf %{SOURCE1}
@@ -330,6 +333,7 @@ find %{buildroot}%{perl_vendorarch} -nam
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 +343,15 @@ pushd docs/docs-%{cpuarch}/pdf; mkdir -p
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
@@ -460,6 +464,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/gdal_translate
%{_bindir}/gdaladdo
%{_bindir}/gdalinfo
+%{_bindir}/gdalbuildvrt
%{_bindir}/gdaltindex
%{_bindir}/gdalwarp
%{_bindir}/gdal_grid
@@ -472,19 +477,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 +510,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 +537,13 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* 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 at lists.fedoraproject.org> - 1.6.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdal/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources 29 Jan 2009 14:21:56 -0000 1.13
+++ sources 30 Jul 2009 10:14:24 -0000 1.14
@@ -1,2 +1,2 @@
-0dab181425d963c2cdf541806a37fde9 gdal-1.6.0-fedora.tar.gz
+52afc44f76ebb2d3a0e73dafa56f1c44 gdal-1.6.1-fedora.tar.gz
8ca6f8b83e0afb7a79040ac19c5b0b76 gdalautotest-1.6.0.tar.gz
More information about the fedora-extras-commits
mailing list