X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=inline;f=gdal.spec;h=b26c736224a4b38ab81ffe4b74094773e06e42d1;hb=e2cf98ec6754967bc42ba15b1421e046ef69ccca;hp=2c567781fe70964fa29d7d03c66128b63eaabb0e;hpb=02ae36595d9e749ac29806524f30bb567f108658;p=packages%2Fgdal.git

diff --git a/gdal.spec b/gdal.spec
index 2c56778..b26c736 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -23,7 +23,7 @@
 %bcond_without	crnlib		# DDS support via crunch/crnlib
 %bcond_without	epsilon		# EPSILON wavelet compression support
 %bcond_without	fyba		# SOSI geodata support using FYBA
-%bcond_with	grass		# GRASS support (note: dependency loop)
+%bcond_with	grass		# GRASS support (note: dependency loop; use gdal-grass.spec instead)
 %bcond_without	gta		# GTA format support
 %bcond_without	mysql		# MySQL DB support
 %bcond_with	oci		# ORACLE OCI DB and Georaster support
@@ -37,7 +37,7 @@
 %bcond_without	xerces		# Xerces support
 %bcond_without	java		# Java and MDB support
 %bcond_without	php		# PHP binding
-%bcond_without	ruby		# Ruby binding
+%bcond_with	ruby		# Ruby binding
 
 %if %{with podofo}
 %undefine	with_poppler
@@ -48,26 +48,23 @@
 Summary:	Geospatial Data Abstraction Library
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
-Version:	1.11.0
-Release:	7
+Version:	2.0.1
+Release:	2
 License:	BSD-like
 Group:		Libraries
 Source0:	http://download.osgeo.org/gdal/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	31f2c4a7230b40e5fdc3cf12a100f96b
+# Source0-md5:	27022cc4a3e0819ab02a69c2d0867437
 Patch0:		%{name}-perl.patch
 Patch1:		%{name}-python_install.patch
 Patch2:		%{name}-php.patch
 Patch3:		%{name}-fpic.patch
-Patch4:		%{name}-format-security.patch
 Patch5:		%{name}-grass.patch
-Patch6:		%{name}-sse.patch
 Patch7:		%{name}-link.patch
 Patch8:		%{name}-fyba.patch
 Patch9:		%{name}-dds.patch
-Patch10:	%{name}-gif.patch
 Patch11:	%{name}-armadillo.patch
-Patch12:	%{name}-oci.patch
-Patch13:	%{name}-rasdaman.patch
+Patch12:	%{name}-rasdaman.patch
+Patch13:	%{name}-pluginsdir.patch
 URL:		http://www.gdal.org/
 %{?with_php:BuildRequires:	%{php_name}-devel}
 %{?with_opencl:BuildRequires:	OpenCL-devel >= 1.0}
@@ -92,7 +89,7 @@ BuildRequires:	jasper-devel
 %{?with_java:BuildRequires:	jdk}
 %{?with_java:BuildRequires:	jpackage-utils}
 BuildRequires:	json-c-devel >= 0.11
-BuildRequires:	libcsf-devel
+BuildRequires:	libcsf-devel >= 2.0-0.041111.6
 BuildRequires:	libdap-devel >= 3.10
 BuildRequires:	libgeotiff-devel >= 1.2.1
 %{?with_gta:BuildRequires:	libgta-devel}
@@ -286,13 +283,10 @@ osr.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -325,9 +319,20 @@ sed -i -e 's#^mandir=.*##g' configure.in
 %{__sed} -i -e 's,DODS_INC="-I.*,DODS_INC="$(pkg-config --cflags libdap)",' configure.in
 
 %build
+%ifarch %{x8664}
+jvm_arch=amd64
+%endif
+%ifarch %{ix86}
+jvm_arch=i386
+%endif
+%ifarch x32
+jvm_arch=x32
+%endif
+
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %configure \
 	--includedir=%{_includedir}/gdal \
 	--datadir=%{_datadir}/gdal \
@@ -340,7 +345,7 @@ sed -i -e 's#^mandir=.*##g' configure.in
 	--with-hide-internal-symbols \
 	%{?with_java:--with-java=%{java_home}} \
 	--with-liblzma \
-	%{?with_java:--with-mdb --with-jvm-lib-add-rpath} \
+	%{?with_java:--with-mdb --with-jvm-lib-add-rpath --with-jvm-lib=%{java_home}/jre/lib/$jvm_arch/server} \
 	%{?with_mysql:--with-mysql} \
 	%{?with_oci:--with-oci --with-oci-include=/usr/include/oracle/client --with-oci-lib=%{_libdir}} \
 	%{?with_opencl:--with-opencl} \
@@ -358,6 +363,7 @@ sed -i -e 's#^mandir=.*##g' configure.in
 	%{?with_xerces:--with-xerces} \
 	--with-xerces-inc=/usr/include/xercesc \
 	--with-xerces-lib="-lxerces-c" \
+	--with-autoload=%{_libdir}/gdalplugins \
 	--without-libgrass
 #	--with-pcidsk=/usr (needs > 0.3)
 # csharp builds, but has no configure option nor install target
@@ -384,7 +390,6 @@ rm -rf $RPM_BUILD_ROOT
 
 rm -rf _html
 cp -a html _html
-cp -a ogr/html _html/ogr
 
 %if %{with php}
 # missing in make install
@@ -472,7 +477,8 @@ rm -rf $RPM_BUILD_ROOT
 %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
+%attr(755,root,root) %ghost %{_libdir}/libgdal.so.20
+%dir %{_libdir}/gdalplugins
 %{_datadir}/gdal
 %{_mandir}/man1/gdal2tiles.1*
 %{_mandir}/man1/gdal_calc.1*
@@ -540,6 +546,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{perl_vendorarch}/auto/Geo/OGR/OGR.so
 %dir %{perl_vendorarch}/auto/Geo/OSR
 %attr(755,root,root) %{perl_vendorarch}/auto/Geo/OSR/OSR.so
+%{_mandir}/man3/Geo::GDAL.3pm*
 
 %if %{with php}
 %files -n %{php_name}-gdal