From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Mon, 2 Mar 2015 14:50:52 +0000 (+0100)
Subject: - added pluginsdir patch (fix gdalplugins dir location for lib64/libx32 ABIs)
X-Git-Tag: auto/th/gdal-1.11.2-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdal.git;a=commitdiff_plain;h=0a5f35eb588be6e43222ca1c47d066a004128392

- added pluginsdir patch (fix gdalplugins dir location for lib64/libx32 ABIs)
- package gdalplugins dir
---

diff --git a/gdal-pluginsdir.patch b/gdal-pluginsdir.patch
new file mode 100644
index 0000000..93bbf6f
--- /dev/null
+++ b/gdal-pluginsdir.patch
@@ -0,0 +1,53 @@
+--- gdal-1.11.2/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp.orig	2015-02-10 13:11:16.000000000 +0100
++++ gdal-1.11.2/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp	2015-03-01 21:09:07.960962291 +0100
+@@ -815,12 +815,12 @@
+     }
+     else
+     {
+-#ifdef GDAL_PREFIX
++#if 1
+         papszSearchPath = CSLAddString( papszSearchPath,
+     #ifdef MACOSX_FRAMEWORK
+                                         GDAL_PREFIX "/PlugIns");
+     #else
+-                                        GDAL_PREFIX "/lib/gdalplugins" );
++                                        GDAL_LIBDIR "/gdalplugins" );
+     #endif
+ #else
+         char szExecPath[1024];
+--- gdal-1.11.2/gcore/gdaldrivermanager.cpp.orig	2015-02-10 13:12:08.000000000 +0100
++++ gdal-1.11.2/gcore/gdaldrivermanager.cpp	2015-03-01 21:11:24.537623226 +0100
+@@ -686,12 +686,12 @@
+     }
+     else
+     {
+-#ifdef GDAL_PREFIX
++#if 1
+         papszSearchPath = CSLAddString( papszSearchPath, 
+     #ifdef MACOSX_FRAMEWORK
+                                         GDAL_PREFIX "/PlugIns");
+     #else
+-                                        GDAL_PREFIX "/lib/gdalplugins" );
++                                        GDAL_LIBDIR "/gdalplugins" );
+     #endif
+ #else
+         char szExecPath[1024];
+--- gdal-1.11.2/configure.in.orig	2015-03-01 09:07:33.069445871 +0100
++++ gdal-1.11.2/configure.in	2015-03-01 21:13:55.727616880 +0100
+@@ -3812,12 +3812,16 @@
+ 
+ if test "$prefix" = "NONE" ; then 
+   GDAL_PREFIX=/usr/local
++  GDAL_LIBDIR=${GDAL_PREFIX}/lib
+ else
+   GDAL_PREFIX=${prefix}
++  eval eval GDAL_LIBDIR="${libdir}"
+ fi
+ 
+ export GDAL_PREFIX
++export GDAL_LIBDIR
+ AC_DEFINE_UNQUOTED(GDAL_PREFIX,["]$GDAL_PREFIX["], [--prefix directory for GDAL install])
++AC_DEFINE_UNQUOTED(GDAL_LIBDIR,["]$GDAL_LIBDIR["], [--prefix directory for GDAL install])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl Perl bindings.
diff --git a/gdal.spec b/gdal.spec
index b2b7e07..435c526 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
@@ -66,6 +66,7 @@ Patch8:		%{name}-fyba.patch
 Patch9:		%{name}-dds.patch
 Patch11:	%{name}-armadillo.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,6 +293,7 @@ osr.
 %patch9 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 # need to regenerate (old ones don't support perl 5.10 or php 5.5)
 %{__rm} swig/{perl,php}/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
@@ -324,6 +326,7 @@ sed -i -e 's#^mandir=.*##g' configure.in
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
 %configure \
 	--includedir=%{_includedir}/gdal \
 	--datadir=%{_datadir}/gdal \
@@ -469,6 +472,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*