X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gdal.spec;h=e53f7731caa8afa74fca09dd7a3e4e9ce884cc18;hb=4007e9a21d0f5b8a70a1ea1de247ca63d662f07e;hp=ad6052f04c35d24c105c78cd0fe14678e44f333e;hpb=d0c5c098cde1cadac72c47ac498ac4cb7f2110d3;p=packages%2Fgdal.git

diff --git a/gdal.spec b/gdal.spec
index ad6052f..e53f773 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
@@ -48,12 +48,12 @@
 Summary:	Geospatial Data Abstraction Library
 Summary(pl.UTF-8):	Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
 Name:		gdal
-Version:	1.11.0
-Release:	4
+Version:	1.11.2
+Release:	3
 License:	BSD-like
 Group:		Libraries
 Source0:	http://download.osgeo.org/gdal/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	31f2c4a7230b40e5fdc3cf12a100f96b
+# Source0-md5:	90221810dd9ca656ee23d434d4266ef6
 Patch0:		%{name}-perl.patch
 Patch1:		%{name}-python_install.patch
 Patch2:		%{name}-php.patch
@@ -64,10 +64,9 @@ 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}
@@ -292,7 +291,6 @@ osr.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -325,10 +323,22 @@ 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 \
 	--with-dods-root=/usr \
 	%{?with_armadillo:--with-armadillo} \
@@ -339,7 +349,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} \
@@ -472,6 +482,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/testepsg
 %attr(755,root,root) %{_libdir}/libgdal.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgdal.so.1
+%dir %{_libdir}/gdalplugins
 %{_datadir}/gdal
 %{_mandir}/man1/gdal2tiles.1*
 %{_mandir}/man1/gdal_calc.1*
@@ -515,16 +526,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgdal.so
 %{_libdir}/libgdal.la
 %{_pkgconfigdir}/gdal.pc
-%{_includedir}/cpl_*.h
-%{_includedir}/cplkeywordparser.h
-%{_includedir}/gdal*.h
-%{_includedir}/gvgcpfit.h
-%{_includedir}/memdataset.h
-%{_includedir}/ogr_*.h
-%{_includedir}/ogrsf_frmts.h
-%{_includedir}/rawdataset.h
-%{_includedir}/thinplatespline.h
-%{_includedir}/vrtdataset.h
+%{_includedir}/gdal
 %{_mandir}/man1/gdal-config.1*
 
 %files static