Author: qboosh Date: Fri Jan 28 17:36:17 2011 GMT
Module: packages Tag: DEVEL
---- Log message:
- started update to 1.8.0 (uses libtiff 4.0 features)
---- Files affected:
packages/gdal:
gdal-asneeded.patch (1.2 -> 1.2.2.1) , gdal-perl.patch (1.3 -> 1.3.2.1) ,
gdal.spec (1.85 -> 1.85.2.1)
---- Diffs:
================================================================
Index: packages/gdal/gdal-asneeded.patch
diff -u packages/gdal/gdal-asneeded.patch:1.2
packages/gdal/gdal-asneeded.patch:1.2.2.1
--- packages/gdal/gdal-asneeded.patch:1.2 Wed Jun 11 19:12:10 2008
+++ packages/gdal/gdal-asneeded.patch Fri Jan 28 18:36:12 2011
@@ -1,5 +1,5 @@
---- gdal-1.5.1/m4/ax_xerces.m4.orig 2007-12-07 01:26:11.000000000 +0100
-+++ gdal-1.5.1/m4/ax_xerces.m4 2008-06-05 22:45:13.942715785 +0200
+--- gdal-1.8.0/m4/ax_lib_xerces.m4.orig 2007-12-07 01:26:11.000000000
+0100
++++ gdal-1.8.0/m4/ax_lib_xerces.m4 2008-06-05 22:45:13.942715785 +0200
@@ -116,8 +116,8 @@
saved_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$xerces_include_dir -I$xerces_include_dir2"
================================================================
Index: packages/gdal/gdal-perl.patch
diff -u packages/gdal/gdal-perl.patch:1.3 packages/gdal/gdal-perl.patch:1.3.2.1
--- packages/gdal/gdal-perl.patch:1.3 Wed Jul 8 22:37:59 2009
+++ packages/gdal/gdal-perl.patch Fri Jan 28 18:36:12 2011
@@ -1,9 +1,11 @@
-diff -Nur gdal-1.6.1.orig/swig/perl/GNUmakefile
gdal-1.6.1/swig/perl/GNUmakefile
---- gdal-1.6.1.orig/swig/perl/GNUmakefile 2008-09-13 12:49:45.000000000
+0100
-+++ gdal-1.6.1/swig/perl/GNUmakefile 2009-07-08 21:20:24.000000000 +0100
-@@ -46,4 +46,4 @@
- $(MAKE) -f Makefile_Geo__GDAL dist
+--- gdal-1.8.0/swig/perl/GNUmakefile.orig 2011-01-14 06:19:06.000000000
+0100
++++ gdal-1.8.0/swig/perl/GNUmakefile 2011-01-26 17:16:08.978356589 +0100
+@@ -26,7 +26,7 @@
+ gdal_wrap.cc: generate
Makefile_Geo__GDAL:
-- perl Makefile.PL
+- perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
+ perl Makefile.PL INSTALLDIRS=vendor
+
+ test: build
+ $(MAKE) -f Makefile_Geo__GDAL test
================================================================
Index: packages/gdal/gdal.spec
diff -u packages/gdal/gdal.spec:1.85 packages/gdal/gdal.spec:1.85.2.1
--- packages/gdal/gdal.spec:1.85 Sat Jan 22 21:04:06 2011
+++ packages/gdal/gdal.spec Fri Jan 28 18:36:12 2011
@@ -1,5 +1,8 @@
# $Revision$, $Date$
-# TODO: csharp, java, mysql
+# TODO:
+# - wait for libtiff 4.0, reenable libtiff and libgeotiff deps (internal
versions used until then)
+# - wait for newer pcidsk, switch to external again
+# - csharp, java, mysql
#
# Conditional build:
%bcond_without odbc # disable odbc support
@@ -9,18 +12,17 @@
Summary: Geospatial Data Abstraction Library
Summary(pl.UTF-8): Biblioteka abstrakcji danych dotyczących powierzchni
Ziemi
Name: gdal
-Version: 1.7.3
-Release: 3
+Version: 1.8.0
+Release: 0.1
License: BSD-like
Group: Libraries
Source0: ftp://ftp.remotesensing.org/gdal/%{name}-%{version}.tar.gz
-# Source0-md5: c4673970bd2285032de9ae9bbd82754a
+# Source0-md5: c762cdab0f7e51a677ba49278a8a263d
Patch0: %{name}-perl.patch
Patch1: %{name}-ruby.patch
Patch2: %{name}-asneeded.patch
Patch3: %{name}-python_install.patch
-Patch4: %{name}-libdap.patch
-Patch5: %{name}-doxy.patch
+Patch4: %{name}-doxy.patch
URL: http://www.gdal.org/
BuildRequires: autoconf >= 2.52
BuildRequires: automake
@@ -34,17 +36,17 @@
BuildRequires: jasper-devel
BuildRequires: libcsf-devel
BuildRequires: libdap-devel >= 3.10
-BuildRequires: libgeotiff-devel >= 1.2.1
+#BuildRequires: libgeotiff-devel >= 1.2.1
BuildRequires: libjpeg-devel >= 6b
BuildRequires: libpng-devel >= 2:1.2.8
BuildRequires: libstdc++-devel
-BuildRequires: libtiff-devel >= 3.6.0
+#BuildRequires: libtiff-devel >= 4.0
BuildRequires: libtool
BuildRequires: libuuid-devel
BuildRequires: libxml2-devel
BuildRequires: netcdf-devel
BuildRequires: ogdi-devel >= 3.1
-BuildRequires: pcidsk-devel
+#BuildRequires: pcidsk-devel > 0.3
BuildRequires: perl-devel
BuildRequires: postgresql-backend-devel
BuildRequires: postgresql-devel
@@ -68,9 +70,9 @@
%{?with_xerces:BuildRequires: xerces-c-devel >= 2.2.0}
BuildRequires: zlib-devel >= 1.1.4
Requires: geos >= 2.2
-Requires: libgeotiff >= 1.2.1
+#Requires: libgeotiff >= 1.2.1
Requires: libpng >= 2:1.2.8
-Requires: libtiff >= 3.6.0
+#Requires: libtiff >= 4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -103,14 +105,14 @@
Requires: jasper-devel
Requires: libcsf-devel
Requires: libdap-devel >= 3.10
-Requires: libgeotiff-devel >= 1.2.1
+#Requires: libgeotiff-devel >= 1.2.1
Requires: libjpeg-devel
Requires: libpng-devel >= 2:1.2.8
Requires: libstdc++-devel
-Requires: libtiff-devel >= 3.6.0
+#Requires: libtiff-devel >= 4.0
Requires: netcdf-devel
Requires: ogdi-devel >= 3.1
-Requires: pcidsk-devel
+#Requires: pcidsk-devel > 0.3
Requires: postgresql-devel
Requires: sqlite3-devel >= 3
%{?with_odbc:Requires: unixODBC-devel}
@@ -180,7 +182,6 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -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}
@@ -198,11 +199,11 @@
%{__aclocal} -I m4
%{__autoconf}
# disable grass/libgrass here, it can be built from separate gdal-grass package
+# note: "WARNING: unrecognized options: --with-hide-internal-symbols" is
caused by configure bug; option DOES take effect
%configure \
--datadir=%{_datadir}/gdal \
--with-dods-root=/usr \
--with-hide-internal-symbols \
- --with-pcidsk=/usr \
--with-perl \
--with-python \
%{?with_ruby:--with-ruby} \
@@ -212,6 +213,7 @@
--with-xerces-lib="-lxerces-c" \
--without-grass \
--without-libgrass
+# --with-pcidsk=/usr (needs > 0.3)
# --with-php needs Zend API update
# java broken, no configure option
# csharp builds, but has no configure option
@@ -247,10 +249,8 @@
%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Geo/OSR/.packlist
# some doxygen trash
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/GDAL.dox
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/GDAL/Const.dox
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/OGR.dox
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/OSR.dox
+%{__rm}
$RPM_BUILD_ROOT%{perl_vendorarch}/Geo/{GDAL.dox,GDAL/Const.dox,OGR.dox,OSR.dox}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/gdal_{fillnodata,sieve}.dox
%if %{with ruby}
%{__rm} $RPM_BUILD_ROOT%{ruby_sitearchdir}/gdal/*.la
@@ -272,6 +272,7 @@
%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_calc.py
%attr(755,root,root) %{_bindir}/gdal_fillnodata.py
%attr(755,root,root) %{_bindir}/gdal_grid
%attr(755,root,root) %{_bindir}/gdal_merge.py
@@ -289,6 +290,7 @@
%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}/gdallocationinfo
%attr(755,root,root) %{_bindir}/gdalmanage
%attr(755,root,root) %{_bindir}/gdaltindex
%attr(755,root,root) %{_bindir}/gdaltransform
@@ -318,6 +320,7 @@
%{_mandir}/man1/gdalbuildvrt.1*
%{_mandir}/man1/gdaldem.1*
%{_mandir}/man1/gdalinfo.1*
+%{_mandir}/man1/gdallocationinfo.1*
%{_mandir}/man1/gdaltindex.1*
%{_mandir}/man1/gdaltransform.1*
%{_mandir}/man1/gdalwarp.1*
@@ -405,6 +408,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.85.2.1 2011/01/28 17:36:12 qboosh
+- started update to 1.8.0 (uses libtiff 4.0 features)
+
Revision 1.85 2011/01/22 20:04:06 sparky
- BR: libuuid-devel, libxml2-devel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal-asneeded.patch?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal-perl.patch?r1=1.3&r2=1.3.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdal/gdal.spec?r1=1.85&r2=1.85.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
