From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 14 Jun 2014 20:23:30 +0000 (+0200)
Subject: Merge branch 'master' of git://git.pld-linux.org/packages/gdal
X-Git-Tag: auto/th/gdal-1.11.0-4~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgdal.git;a=commitdiff_plain;h=baf631adca0fe6c875f5a9772a6f2f446c810bb4

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

baf631adca0fe6c875f5a9772a6f2f446c810bb4
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