X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdal.git;a=blobdiff_plain;f=gdal.spec;h=bf95d8a257dbdd0368163505b54d5d14876b47d0;hp=59a0e4ea88a4bd16d690ebbc260f33bf6cfc3683;hb=fa466c1cc56c191f6bee62b1d3b4a2fad1b64867;hpb=b8fd1db8292497a1ba8b7c68d2888be5115c53e6

diff --git a/gdal.spec b/gdal.spec
index 59a0e4e..bf95d8a 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -8,18 +8,18 @@
 Summary:	Geospatial Data Abstraction Library
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
-Version:	1.5.2
-Release:	4
+Version:	1.6.1
+Release:	6
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.remotesensing.org/gdal/%{name}-%{version}.tar.gz
-# Source0-md5:	1939de5fe43d12884d85fa5d7797e3c2
+# Source0-md5:	4059285a5cef41ff975ed0ec02a97009
 Patch0:		%{name}-dods.patch
 Patch1:		%{name}-perl.patch
 Patch2:		%{name}-ruby.patch
 Patch3:		%{name}-asneeded.patch
 Patch4:		%{name}-ogdi.patch
-Patch5:		%{name}-hdf.patch
+Patch5:		%{name}-python_install.patch
 URL:		http://www.gdal.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -46,10 +46,19 @@ BuildRequires:	postgresql-backend-devel
 BuildRequires:	postgresql-devel
 BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	python-numpy-devel >= 1:1.0.0
+BuildRequires:	rpm-pythonprov
 %{?with_ruby:BuildRequires:	ruby-devel}
 BuildRequires:	sqlite3-devel >= 3
+BuildRequires:	swig-perl
 BuildRequires:	swig-python >= 1.3
 %{?with_ruby:BuildRequires:	swig-ruby}
+%if "%{pld_release}" == "ti"
+BuildRequires:	tetex-format-latex
+BuildRequires:	tetex-dvips
+%else
+BuildRequires:	texlive-dvips
+BuildRequires:	texlive-latex
+%endif
 %{?with_odbc:BuildRequires:	unixODBC-devel}
 %{?with_xerces:BuildRequires:	xerces-c-devel >= 2.2.0}
 BuildRequires:	zlib-devel >= 1.1.4
@@ -198,16 +207,16 @@ cp -f /usr/share/automake/config.* .
 # csharp builds, but has no configure option
 
 # regenerate where needed
-%{__make} -C swig/perl generate
+%{__make} -j1 -C swig/perl generate
 
-%{__make}
+%{__make} -j1
 
-%{__make} docs
+%{__make} -j1 docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install install-man \
+%{__make} -j1 install install-man \
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf _html
@@ -230,7 +239,9 @@ cp -a ogr/html _html/ogr
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/OGR.dox
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Geo/OSR.dox
 
+%if %{with ruby}
 %{__rm} $RPM_BUILD_ROOT%{ruby_sitearchdir}/gdal/*.la
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT