From 09f1b1836a83b6f9ce22a74cade690de0e40d8d8 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Sun, 8 May 2016 09:53:15 +0100
Subject: gis/gdal: Updated for version 2.1.0.

Signed-off-by: David Spencer <baildon.research@googlemail.com>
---
 gis/gdal/gdal-python-install.patch | 10 ----------
 gis/gdal/gdal.SlackBuild           |  5 +----
 gis/gdal/gdal.info                 |  6 +++---
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 gis/gdal/gdal-python-install.patch

(limited to 'gis/gdal')

diff --git a/gis/gdal/gdal-python-install.patch b/gis/gdal/gdal-python-install.patch
deleted file mode 100644
index 8ec414d37a..0000000000
--- a/gis/gdal/gdal-python-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- swig/python/GNUmakefile.orig	2010-04-24 01:22:07.000000000 +0200
-+++ swig/python/GNUmakefile	2010-05-05 19:14:58.000000000 +0200
-@@ -72,5 +72,5 @@
- ifeq ($(PY_HAVE_SETUPTOOLS),1)
--	$(PYTHON) setup.py install 
-+	$(PYTHON) setup.py install --root=$(DESTDIR) 
- else
--	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- endif
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild
index d6fb931aa5..01d4257d88 100644
--- a/gis/gdal/gdal.SlackBuild
+++ b/gis/gdal/gdal.SlackBuild
@@ -24,7 +24,7 @@
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
 PRGNAM=gdal
-VERSION=${VERSION:-2.0.2}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -111,9 +111,6 @@ else
    WITHLIST+=" --with-jpeg=/usr/lib${LIBDIRSUFFIX}"
 fi
 
-# Thanks to the people at Arch for this:
-patch -p0 <$CWD/gdal-python-install.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/gis/gdal/gdal.info b/gis/gdal/gdal.info
index 1ca4448276..2d2548b991 100644
--- a/gis/gdal/gdal.info
+++ b/gis/gdal/gdal.info
@@ -1,8 +1,8 @@
 PRGNAM="gdal"
-VERSION="2.0.2"
+VERSION="2.1.0"
 HOMEPAGE="http://www.gdal.org/"
-DOWNLOAD="http://download.osgeo.org/gdal/2.0.2/gdal-2.0.2.tar.xz"
-MD5SUM="940208e737c87d31a90eaae43d0efd65"
+DOWNLOAD="http://download.osgeo.org/gdal/2.1.0/gdal-2.1.0.tar.xz"
+MD5SUM="1a6e720597efd84661869fb66b6986e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="geos proj"
-- 
cgit v1.2.3