[packages/gdal: 2/3] Merge branch 'master' of git://git.pld-linux.org/packages/gdal

[qboosh]

commit baf631adca0fe6c875f5a9772a6f2f446c810bb4
Merge: 779b0ee ead243f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 14 22:23:30 2014 +0200

    Merge branch 'master' of git://git.pld-linux.org/packages/gdal

 gdal.spec | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)
---
diff --cc gdal.spec
index 9052012,a9ae74d..2f8af60
--- a/gdal.spec
+++ b/gdal.spec
@@@ -61,13 -61,8 +62,14 @@@ Patch4:		%{name}-format-security.patc
  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
  URL:		http://www.gdal.org/
+ %{?with_php:BuildRequires:	%{php_name}-devel}
  %{?with_opencl:BuildRequires:	OpenCL-devel >= 1.0}
  %{?with_armadillo:BuildRequires:	armadillo-devel}
  BuildRequires:	autoconf >= 2.52
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gdal.git/commitdiff/66daf0b18145ccf574f66758c88fd0c5e7e05f40