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

diff --cc gdal.spec
index 905201254a70305f68a75fbbbfe3aff26a1add28,a9ae74d6fe3e52eefbfe706e695d1a208898c054..2f8af60239db8c3d7eff914e28ae35ce52285b6a
--- 1/gdal.spec
--- 2/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