- rel. 5 (rebuild against current netcdf)

[packages/gdal.git] / gdal.spec

diff --git a/gdal.spec b/gdal.spec
index 17c7978d8f9fef37eb211e27e753adcfeee88344..6d577be4b1bc2126f4675c532f93ea59b502265f 100644 (file)
--- a/gdal.spec
+++ b/gdal.spec
@@ -1,5 +1,4 @@
 # TODO: csharp, java, mysql
-#       use external pcidsk (http://home.gdal.org/projects/pcidsk/)?
 #
 # Conditional build:
 %bcond_without odbc    # disable odbc support
@@ -9,22 +8,23 @@
 Summary:       Geospatial Data Abstraction Library
 Summary(pl.UTF-8):     Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:          gdal
-Version:       1.7.2
-Release:       4
+Version:       1.7.3
+Release:       5
 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.2
 BuildRequires: giflib-devel >= 4.0
@@ -39,8 +39,11 @@ 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
@@ -106,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}
@@ -175,6 +179,7 @@ osr.
 %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}
@@ -189,7 +194,6 @@ osr.
 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
@@ -197,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} \