X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdal.git;a=blobdiff_plain;f=gdal.spec;h=b26c736224a4b38ab81ffe4b74094773e06e42d1;hp=361fa41174195052aa27e88c05ee1750b21dae94;hb=e2cf98ec6754967bc42ba15b1421e046ef69ccca;hpb=fffcf251a13b2009311c966e51ac681f74423ced

diff --git a/gdal.spec b/gdal.spec
index 361fa41..b26c736 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -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,19 +48,17 @@
 Summary:	Geospatial Data Abstraction Library
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
-Version:	1.11.2
-Release:	1.1
+Version:	2.0.1
+Release:	2
 License:	BSD-like
 Group:		Libraries
 Source0:	http://download.osgeo.org/gdal/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	90221810dd9ca656ee23d434d4266ef6
+# 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
@@ -91,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}
@@ -285,9 +283,7 @@ osr.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -367,6 +363,7 @@ jvm_arch=x32
 	%{?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
@@ -393,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
@@ -481,7 +477,7 @@ 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*
@@ -550,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