X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdal.git;a=blobdiff_plain;f=gdal.spec;h=40449f9874ec08488ad065b435392b3a81ebc53b;hp=f19a7c748f91913a589adaf2ae09caf855b6a1b4;hb=025cc2591b30c58781b92da06909fcb3753b4910;hpb=017b03bbc379c53fc82a7a5855f303b51c70b6a8

diff --git a/gdal.spec b/gdal.spec
index f19a7c7..40449f9 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -1,55 +1,124 @@
-# TODO: fix LDFLAGS passing (to use as-needed)
+# TODO:
+# - be reasonable about devel dependencies - you do not need all of them to
+#   use gdal (probably a gdal module or driver shall not imply devel
+#   dependency)
+# - spatialite (--with-spatialite; libspatialite: http://www.gaia-gis.it/gaia-sins/)
+# - freexl (http://www.gaia-gis.it/FreeXL/)
+# - rasdaman (--with-rasdaman; http://rasdaman.eecs.jacobs-university.de/trac/rasdaman/wiki/Download)
+# - armadillo (--with-armadillo; http://arma.sourceforge.net/)
+# - openjpeg (unreleased post-1.5 or 2? needs opj_decode_tile_data symbol, not available in 1.3-1.5)
+# - libjpeg12 (needs patching to use system one)
+# - libkml (1.3.0 needed, not released yet)
+# - wait for newer pcidsk, switch to external again
+# - csharp, java, mysql
+# - additional, proprietary(?) formats support:
+#   - FMEObjects (http://www.safe.com/support/support-resources/fme-downloads/)
+#   - ESRI FileGDBAPI (http://resources.arcgis.com/content/geodatabases/10.0/file-gdb-api)
+#   - ECW (http://www.erdas.com/products/ecw/ERDASECWJPEG2000SDK/Details.aspx)
+#   - Kakadu/JPEG2000 (http://www.kakadusoftware.com/)
+#   - MrSID (http://www.lizardtech.com/developer/)
+#   - MSG/EUMETSAT (http://www.eumetsat.int/Home/Main/DataAccess/SupportSoftwareTools/index.htm)
+#   - Oracle/OCI >= 10.0.1 (for georaster); Oracle/OCI >= 8.1.7 (as DB)
+#   - Ingres (--with-ingres=/path)
+#   - Informix DB
+#   - DWGdirect (members only? http://www.opendwg.org/)
+#   - ESRI SDE (http://www.esri.com/software/arcgis/arcsde/index.html)
+#   - OpenCL (--with-opencl; no free Linux implementation yet?)
 #
 # Conditional build:
-%bcond_without	odbc	# disable odbc support
+%bcond_without	epsilon	# EPSILON wavelet compression support
+%bcond_without	gta	# GTA format support
+%bcond_without	odbc	# disable ODBC DB support
+%bcond_with	podofo	# PDF support via podofo instead of poppler
+%bcond_without	poppler	# PDF support via poppler
 %bcond_without	xerces	# disable xerces support
-%bcond_without	ruby	# disable ruby support
+%bcond_without	java	# disable Java and MDB support
+%bcond_without	php	# disable PHP binding
+%bcond_without	ruby	# disable ruby binding
 #
+%if %{with podofo}
+%undefine	with_poppler
+%endif
 Summary:	Geospatial Data Abstraction Library
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
-Version:	1.4.3
-Release:	3
+Version:	1.9.1
+Release:	2
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.remotesensing.org/gdal/%{name}-%{version}.tar.gz
-# Source0-md5:	d2b0d428edab7895aa53c7d827094a09
-Patch0:		%{name}-dods.patch
-Patch1:		%{name}-perl.patch
-Patch2:		%{name}-ruby.patch
+# Source0-md5:	c5cf09b92dac1f5775db056e165b34f5
+Patch0:		%{name}-perl.patch
+Patch1:		%{name}-python_install.patch
+Patch2:		gdal-1.9.1-poppler020.patch
+
+Patch4:		%{name}-php.patch
+Patch5:		%{name}-fpic.patch
 URL:		http://www.gdal.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.52
+BuildRequires:	automake
 BuildRequires:	cfitsio-devel
-BuildRequires:	doxygen
-BuildRequires:	geos-devel >= 2.0
+BuildRequires:	curl-devel
+BuildRequires:	doxygen >= 1.4.2
+%{?with_epsilon:BuildRequires:	epsilon-compressor-devel}
+BuildRequires:	expat-devel >= 1.95.0
+BuildRequires:	geos-devel >= 2.2.0
 BuildRequires:	giflib-devel >= 4.0
 BuildRequires:	hdf-devel >= 4.0
+BuildRequires:	hdf5-devel
 BuildRequires:	jasper-devel
+%{?with_java:BuildRequires:	jdk}
+%{?with_java:BuildRequires:	jpackage-utils}
 BuildRequires:	libcsf-devel
-BuildRequires:	libdap-devel >= 3.5
+BuildRequires:	libdap-devel >= 3.10
 BuildRequires:	libgeotiff-devel >= 1.2.1
+%{?with_gta:BuildRequires:	libgta-devel}
 BuildRequires:	libjpeg-devel >= 6b
+#BuildRequires:	libkml-devel >= 1.3.0
 BuildRequires:	libpng-devel >= 2:1.2.8
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtiff-devel >= 3.6.0
-BuildRequires:	netcdf-devel
+BuildRequires:	libtiff-devel >= 4.0
+BuildRequires:	libtool
+BuildRequires:	libuuid-devel
+BuildRequires:	libwebp-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	netcdf-devel >= 4
 BuildRequires:	ogdi-devel >= 3.1
+#BuildRequires:	pcidsk-devel > 0.3
 BuildRequires:	perl-devel
-BuildRequires:	postgresql-backend-devel
-BuildRequires:	postgresql-devel
+%{?with_php:BuildRequires:	php-devel}
+%{?with_podofo:BuildRequires:	podofo-devel}
+%{?with_poppler:BuildRequires:	poppler-devel}
+# ensure it's compiled with PQescapeStringConn support
+BuildRequires:	postgresql-backend-devel >= 8.1.4
+BuildRequires:	postgresql-devel >= 8.1.4
+BuildRequires:	proj-devel >= 4
 BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	python-numpy-devel >= 1:1.0.0
+BuildRequires:	python-setuptools
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.344
 %{?with_ruby:BuildRequires:	ruby-devel}
-BuildRequires:	sqlite3-devel >= 3
+BuildRequires:	sed >= 4.0
+BuildRequires:	sqlite3-devel >= 3.0.0
+BuildRequires:	swig-perl
 BuildRequires:	swig-python >= 1.3
 %{?with_ruby:BuildRequires:	swig-ruby}
-%{?with_odbc:BuildRequires:	unixODBC-devel}
-%{?with_xerces:BuildRequires:	xerces-c-devel >= 2.2.0}
+%if "%{pld_release}" == "ti"
+BuildRequires:	tetex-format-latex
+BuildRequires:	tetex-dvips
+%else
+BuildRequires:	texlive-dvips
+BuildRequires:	texlive-latex
+%endif
+%{?with_odbc:BuildRequires:	unixODBC-devel >= 2.2.15}
+%{?with_xerces:BuildRequires:	xerces-c-devel >= 2.7.0}
+BuildRequires:	xz-devel
 BuildRequires:	zlib-devel >= 1.1.4
-Requires:	geos >= 2.0
+Requires:	geos >= 2.2.0
 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
@@ -74,23 +143,37 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki GDAL
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	cfitsio-devel
-Requires:	geos-devel >= 2.0
-Requires:	giflib-devel
+Requires:	curl-devel
+%{?with_epsilon:Requires:	epsilon-compressor-devel}
+Requires:	expat-devel >= 1.95.0
+Requires:	geos-devel >= 2.2.0
+Requires:	giflib-devel >= 4.0
 Requires:	hdf-devel >= 4.0
+Requires:	hdf5-devel
 Requires:	jasper-devel
 Requires:	libcsf-devel
-Requires:	libdap-devel >= 3.5
+Requires:	libdap-devel >= 3.10
 Requires:	libgeotiff-devel >= 1.2.1
-Requires:	libjpeg-devel
+%{?with_gta:Requires:	libgta-devel}
+Requires:	libjpeg-devel >= 6b
 Requires:	libpng-devel >= 2:1.2.8
 Requires:	libstdc++-devel
-Requires:	libtiff-devel >= 3.6.0
-Requires:	netcdf-devel
+Requires:	libtiff-devel >= 4.0
+Requires:	libuuid-devel
+Requires:	libwebp-devel
+Requires:	libxml2-devel
+Requires:	netcdf-devel >= 4
 Requires:	ogdi-devel >= 3.1
+#Requires:	pcidsk-devel > 0.3
+%{?with_podofo:Requires:	podofo-devel}
+%{?with_poppler:Requires:	poppler-devel}
 Requires:	postgresql-devel
-Requires:	sqlite3-devel >= 3
+Requires:	proj-devel >= 4
+Requires:	sqlite3-devel >= 3.0.0
 %{?with_odbc:Requires:	unixODBC-devel}
-%{?with_xerces:Requires:	xerces-c-devel >= 2.2.0}
+%{?with_xerces:Requires:	xerces-c-devel >= 2.7.0}
+Requires:	xz-devel
+Requires:	zlib-devel >= 1.1.4
 
 %description devel
 GDAL library header files.
@@ -122,6 +205,19 @@ Perl bindings for GDAL - Geo::GDAL, Geo::OGR and Geo::OSR modules.
 %description -n perl-gdal -l pl.UTF-8
 Wiązania Perla do pakietu GDAL - moduły Geo::GDAL, Geo::OGR, Geo::OSR.
 
+%package -n php-gdal
+Summary:	PHP bindings for GDAL library
+Summary(pl.UTF-8):	Wiązania PHP do biblioteki GDAL
+Group:		Development/Languages/PHP
+Requires:	%{name} = %{version}-%{release}
+%{?requires_php_extension}
+
+%description -n php-gdal
+PHP bindings for GDAL library
+
+%description -n php-gdal -l pl.UTF-8
+Wiązania PHP do biblioteki GDAL.
+
 %package -n python-gdal
 Summary:	GDAL Python module
 Summary(pl.UTF-8):	Moduł Pythona GDAL
@@ -153,51 +249,87 @@ osr.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p4
 
-%build
-# $PYTHON_INCLUDES is set only with --with-python, but we have --with-ngpython,
-# and $PYTHON_INCLUDES is needed to detect numpy properly
-export PYTHON_INCLUDES=-I%{py_incdir}
+%patch4 -p1
+%patch5 -p1
 
-# disable grass/libgrass here, it can be built from separate gdal-grass package
+# 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}
+
+%{__rm} -r man
+
+%{__sed} -i -e 's,DODS_INC="-I.*,DODS_INC="$(pkg-config --cflags libdap)",' configure.in
+
+%build
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
+# disable grass/libgrass here, it can be built from separate gdal-grass package
 %configure \
 	--datadir=%{_datadir}/gdal \
 	--with-dods-root=/usr \
+	%{?with_epsilon:--with-epsilon} \
+	%{!?with_gta:--without-gta} \
+	--with-hide-internal-symbols \
+	%{?with_java:--with-java=%{java_home}} \
+	--with-liblzma \
+	%{?with_java:--with-mdb --with-jvm-lib-add-rpath} \
 	--with-perl \
-	--with-pymoddir=%{py_sitedir} \
+	%{?with_php:--with-php} \
+	%{?with_podofo:--with-podofo} \
+	%{?with_poppler:--with-poppler} \
+	--with-python \
 	%{?with_ruby:--with-ruby} \
-	--with-sqlite \
+	--with-sqlite3 \
+	--with-webp \
 	%{?with_xerces:--with-xerces} \
 	--with-xerces-inc=/usr/include/xercesc \
 	--with-xerces-lib="-lxerces-c" \
 	--without-grass \
-	--without-libgrass \
-	--with-ngpython
-# ngpython seems to be compatibile with old python bindings
-# --with-php needs Zend API update
-%{__make}
+	--without-libgrass
+#	--with-pcidsk=/usr (needs > 0.3)
+# csharp builds, but has no configure option
+
+# regenerate where needed
+%{__make} -j1 -C swig/perl generate
+%{?with_ruby:%{__make} -j1 -C swig/ruby generate}
+
+%{__make} -j1
 
-%{__make} -C swig build \
-	OPTIMIZE="%{rpmcflags}"
+%{__make} -j1 docs
 
-%{__make} docs
+%{__make} -j1 man
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -j1 install install-man \
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf _html
 cp -a html _html
 cp -a ogr/html _html/ogr
 
+%if %{with php}
+# missing in make install
+install -D swig/php/php_gdal.so $RPM_BUILD_ROOT%{php_extensiondir}/gdal.so
+install -D swig/php/php_gdalconst.so $RPM_BUILD_ROOT%{php_extensiondir}/gdalconst.so
+install -D swig/php/php_ogr.so $RPM_BUILD_ROOT%{php_extensiondir}/ogr.so
+install -D swig/php/php_osr.so $RPM_BUILD_ROOT%{php_extensiondir}/osr.so
+install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d
+cat <<'EOF' >$RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/gdal.ini
+; Enable gdal extension module
+extension=gdal.so
+extension=gdalconst.so
+extension=ogr.so
+extension=osr.so
+EOF
+%endif
+
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
 
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Geo/GDAL/.packlist
@@ -206,10 +338,9 @@ rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
 %{__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%{perl_vendorarch}/Geo/check_dox.pl
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/gdal_{fillnodata,sieve}.dox
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -220,13 +351,74 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc NEWS PROVENANCE.TXT
-%attr(755,root,root) %{_bindir}/*
-%exclude %{_bindir}/gdal-config
+%attr(755,root,root) %{_bindir}/epsg_tr.py
+%attr(755,root,root) %{_bindir}/esri2wkt.py
+%attr(755,root,root) %{_bindir}/gcps2vec.py
+%attr(755,root,root) %{_bindir}/gcps2wld.py
+%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
+%attr(755,root,root) %{_bindir}/gdal_polygonize.py
+%attr(755,root,root) %{_bindir}/gdal_proximity.py
+%attr(755,root,root) %{_bindir}/gdal_rasterize
+%attr(755,root,root) %{_bindir}/gdal_retile.py
+%attr(755,root,root) %{_bindir}/gdal_sieve.py
+%attr(755,root,root) %{_bindir}/gdal_translate
+%attr(755,root,root) %{_bindir}/gdaladdo
+%attr(755,root,root) %{_bindir}/gdalbuildvrt
+%attr(755,root,root) %{_bindir}/gdalchksum.py
+%attr(755,root,root) %{_bindir}/gdaldem
+%attr(755,root,root) %{_bindir}/gdalenhance
+%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}/gdalsrsinfo
+%attr(755,root,root) %{_bindir}/gdaltindex
+%attr(755,root,root) %{_bindir}/gdaltransform
+%attr(755,root,root) %{_bindir}/gdalwarp
+%attr(755,root,root) %{_bindir}/mkgraticule.py
+%attr(755,root,root) %{_bindir}/nearblack
+%attr(755,root,root) %{_bindir}/ogr2ogr
+%attr(755,root,root) %{_bindir}/ogrinfo
+%attr(755,root,root) %{_bindir}/ogrtindex
+%attr(755,root,root) %{_bindir}/pct2rgb.py
+%attr(755,root,root) %{_bindir}/rgb2pct.py
+%attr(755,root,root) %{_bindir}/testepsg
 %attr(755,root,root) %{_libdir}/libgdal.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgdal.so.1
 %{_datadir}/gdal
-%{_mandir}/man1/*
-%exclude %{_mandir}/man1/gdal-config.1*
+%{_mandir}/man1/gdal2tiles.1*
+%{_mandir}/man1/gdal_contour.1*
+%{_mandir}/man1/gdal_fillnodata.1*
+%{_mandir}/man1/gdal_grid.1*
+%{_mandir}/man1/gdal_merge.1*
+%{_mandir}/man1/gdal_rasterize.1*
+%{_mandir}/man1/gdal_retile.1*
+%{_mandir}/man1/gdal_sieve.1*
+%{_mandir}/man1/gdal_translate.1*
+%{_mandir}/man1/gdal_utilities.1*
+%{_mandir}/man1/gdaladdo.1*
+%{_mandir}/man1/gdalbuildvrt.1*
+%{_mandir}/man1/gdaldem.1*
+%{_mandir}/man1/gdalinfo.1*
+%{_mandir}/man1/gdallocationinfo.1*
+%{_mandir}/man1/gdalsrsinfo.1*
+%{_mandir}/man1/gdaltindex.1*
+%{_mandir}/man1/gdaltransform.1*
+%{_mandir}/man1/gdalwarp.1*
+%{_mandir}/man1/nearblack.1*
+%{_mandir}/man1/ogr2ogr.1*
+%{_mandir}/man1/ogr_utilities.1*
+%{_mandir}/man1/ogrinfo.1*
+%{_mandir}/man1/ogrtindex.1*
+%{_mandir}/man1/pct2rgb.1*
+%{_mandir}/man1/rgb2pct.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -234,7 +426,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gdal-config
 %attr(755,root,root) %{_libdir}/libgdal.so
 %{_libdir}/libgdal.la
-%{_includedir}/*.h
+%{_includedir}/cpl_*.h
+%{_includedir}/cplkeywordparser.h
+%{_includedir}/gdal*.h
+%{_includedir}/gvgcpfit.h
+%{_includedir}/memdataset.h
+%{_includedir}/ogr_*.h
+%{_includedir}/ogrsf_frmts.h
+%{_includedir}/rawdataset.h
+%{_includedir}/thinplatespline.h
+%{_includedir}/vrtdataset.h
 %{_mandir}/man1/gdal-config.1*
 
 %files static
@@ -263,20 +464,31 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorarch}/auto/Geo/OSR/OSR.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Geo/OSR/OSR.so
 
+%if %{with php}
+%files -n php-gdal
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/gdal.ini
+%attr(755,root,root) %{php_extensiondir}/gdal.so
+%attr(755,root,root) %{php_extensiondir}/gdalconst.so
+%attr(755,root,root) %{php_extensiondir}/ogr.so
+%attr(755,root,root) %{php_extensiondir}/osr.so
+%endif
+
 %files -n python-gdal
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/_gdal.so
-%attr(755,root,root) %{py_sitedir}/_gdalconst.so
-%attr(755,root,root) %{py_sitedir}/_gdal_array.so
-%attr(755,root,root) %{py_sitedir}/_ogr.so
-%attr(755,root,root) %{py_sitedir}/_osr.so
 %{py_sitedir}/gdal.py[co]
 %{py_sitedir}/gdalconst.py[co]
 %{py_sitedir}/gdalnumeric.py[co]
-%{py_sitedir}/gdal_array.py[co]
 %{py_sitedir}/ogr.py[co]
 %{py_sitedir}/osr.py[co]
-%{py_sitedir}/Gdal_Wrapper-*.egg-info
+%{py_sitedir}/GDAL-*.egg-info
+%dir %{py_sitedir}/osgeo
+%attr(755,root,root) %{py_sitedir}/osgeo/_gdal.so
+%attr(755,root,root) %{py_sitedir}/osgeo/_gdal_array.so
+%attr(755,root,root) %{py_sitedir}/osgeo/_gdalconst.so
+%attr(755,root,root) %{py_sitedir}/osgeo/_ogr.so
+%attr(755,root,root) %{py_sitedir}/osgeo/_osr.so
+%{py_sitedir}/osgeo/*.py[co]
 
 %if %{with ruby}
 %files -n ruby-gdal