X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gdal.spec;h=30cdc38fef74515dce1d2fd69a17b37533cc09e4;hb=c6d63a4827185c2494297b57bb9e29a4d5b666a7;hp=e85c9a8c0a9ee0b09c659f974d79f964eb0751c5;hpb=f5a12c6572439112a4abe3671b49d894874fba8b;p=packages%2Fgdal.git

diff --git a/gdal.spec b/gdal.spec
index e85c9a8..30cdc38 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -8,40 +8,46 @@
 Summary:	Geospatial Data Abstraction Library
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
-Version:	1.7.2
-Release:	0.1
+Version:	1.7.3
+Release:	8
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.remotesensing.org/gdal/%{name}-%{version}.tar.gz
-# Source0-md5:	05351f8cb61761ae579667e24a297fe6
+# Source0-md5:	c4673970bd2285032de9ae9bbd82754a
 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
 URL:		http://www.gdal.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	cfitsio-devel
-BuildRequires:	doxygen
+BuildRequires:	doxygen >= 1.4.2
 BuildRequires:	expat-devel >= 1.95.0
-BuildRequires:	geos-devel >= 2.0
+BuildRequires:	geos-devel >= 2.2
 BuildRequires:	giflib-devel >= 4.0
 BuildRequires:	hdf-devel >= 4.0
 BuildRequires:	hdf5-devel
 BuildRequires:	jasper-devel
 BuildRequires:	libcsf-devel
-BuildRequires:	libdap-devel >= 3.5
+BuildRequires:	libdap-devel >= 3.10
 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:	libtool
+BuildRequires:	libuuid-devel
+BuildRequires:	libxml2-devel
 BuildRequires:	netcdf-devel
 BuildRequires:	ogdi-devel >= 3.1
+BuildRequires:	pcidsk-devel
 BuildRequires:	perl-devel
 BuildRequires:	postgresql-backend-devel
 BuildRequires:	postgresql-devel
+BuildRequires:	proj-devel
 BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	python-numpy-devel >= 1:1.0.0
 BuildRequires:	rpm-pythonprov
@@ -60,7 +66,7 @@ BuildRequires:	texlive-latex
 %{?with_odbc:BuildRequires:	unixODBC-devel}
 %{?with_xerces:BuildRequires:	xerces-c-devel >= 2.2.0}
 BuildRequires:	zlib-devel >= 1.1.4
-Requires:	geos >= 2.0
+Requires:	geos >= 2.2
 Requires:	libgeotiff >= 1.2.1
 Requires:	libpng >= 2:1.2.8
 Requires:	libtiff >= 3.6.0
@@ -89,13 +95,13 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	cfitsio-devel
 Requires:	expat-devel >= 1.95.0
-Requires:	geos-devel >= 2.0
+Requires:	geos-devel >= 2.2
 Requires:	giflib-devel
 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
 Requires:	libpng-devel >= 2:1.2.8
@@ -103,6 +109,7 @@ Requires:	libstdc++-devel
 Requires:	libtiff-devel >= 3.6.0
 Requires:	netcdf-devel
 Requires:	ogdi-devel >= 3.1
+Requires:	pcidsk-devel
 Requires:	postgresql-devel
 Requires:	sqlite3-devel >= 3
 %{?with_odbc:Requires:	unixODBC-devel}
@@ -171,13 +178,15 @@ osr.
 %patch1 -p1
 %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}
+%{__rm} swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
 # includes updated for Ruby 1.9
-rm swig/ruby/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
+%{__rm} swig/ruby/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
 
-rm -rf man
+%{__rm} -r man
 
 %build
 # $PYTHON_INCLUDES is set only with --with-ogpython, but we have --with-python,
@@ -185,7 +194,6 @@ rm -rf man
 export PYTHON_INCLUDES=-I%{py_incdir}
 
 %{__libtoolize}
-cp -f /usr/share/automake/config.* .
 %{__aclocal} -I m4
 %{__autoconf}
 # disable grass/libgrass here, it can be built from separate gdal-grass package
@@ -193,6 +201,7 @@ cp -f /usr/share/automake/config.* .
 	--datadir=%{_datadir}/gdal \
 	--with-dods-root=/usr \
 	--with-hide-internal-symbols \
+	--with-pcidsk=/usr \
 	--with-perl \
 	--with-python \
 	%{?with_ruby:--with-ruby} \
@@ -208,7 +217,7 @@ cp -f /usr/share/automake/config.* .
 
 # regenerate where needed
 %{__make} -j1 -C swig/perl generate
-%{__make} -j1 -C swig/ruby generate
+%{?with_ruby:%{__make} -j1 -C swig/ruby generate}
 
 %{__make} -j1
 
@@ -255,13 +264,69 @@ 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_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}/gdalmanage
+%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/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)
@@ -269,7 +334,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