- release 3

[packages/gdal.git] / gdal.spec

diff --git a/gdal.spec b/gdal.spec
index 81a9347bb250c936fe69db4cd028d9e38169accf..f3d1503f7013bb215b6f8cb3cf49e026e3038863 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,12 +8,12 @@
 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:       3
 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
@@ -41,6 +40,7 @@ BuildRequires:        libtiff-devel >= 3.6.0
 BuildRequires: libtool
 BuildRequires: netcdf-devel
 BuildRequires: ogdi-devel >= 3.1
+BuildRequires: pcidsk-devel
 BuildRequires: perl-devel
 BuildRequires: postgresql-backend-devel
 BuildRequires: postgresql-devel
@@ -106,6 +106,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}
@@ -189,7 +190,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 +197,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} \
@@ -212,7 +213,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