Update GDAL version

2 files changed, 12 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef38e6c767ff..c8b1c6b79af5 100755..100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gdal-hdf4
 	pkgdesc = A translator library for raster geospatial data formats, with support to HDF4 format (required to use MODIStsp tool: http://github.com/lbusett/MODIStsp)
-	pkgver = 3.0.0
-	pkgrel = 2.0
+	pkgver = 3.0.2
+	pkgrel = 1.0
 	url = http://www.gdal.org/
 	changelog = gdal-hdf4.changelog
 	arch = x86_64
@@ -11,7 +11,7 @@ pkgbase = gdal-hdf4
 	makedepends = chrpath
 	makedepends = doxygen
 	makedepends = python-numpy
-	makedepends = python2-numpy
+	makedepends = boost
 	depends = curl
 	depends = geos
 	depends = giflib
@@ -37,26 +37,18 @@ pkgbase = gdal-hdf4
 	provides = gdal
 	conflicts = gdal
 	options = !emptydirs
-	source = https://download.osgeo.org/gdal/3.0.0/gdal-3.0.0.tar.xz
+	source = https://download.osgeo.org/gdal/3.0.2/gdal-3.0.2.tar.xz
 	source = gdal-perl-vendor.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/gdal-perl-vendor.patch?h=packages/gdal
-	sha256sums = ad316fa052d94d9606e90b20a514b92b2dd64e3142dfdbd8f10981a5fcd5c43e
+	sha256sums = c3765371ce391715c8f28bd6defbc70b57aa43341f6e94605f04fe3c92468983
 	sha256sums = 2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed
 
 pkgname = gdal-hdf4
 
 pkgname = python-gdal-hdf4
 	pkgdesc = Python bindings for GDAL, with support to HDF4 format
-	depends = gdal-hdf4=3.0.0
+	depends = gdal-hdf4=3.0.2
 	depends = python-numpy
 	optdepends = 
 	provides = python-gdal
 	conflicts = python-gdal
 
-pkgname = python2-gdal-hdf4
-	pkgdesc = Python 2 bindings for GDAL, with support to HDF4 format
-	depends = gdal-hdf4=3.0.0
-	depends = python2-numpy
-	optdepends = 
-	provides = python2-gdal
-	conflicts = python2-gdal
-
diff --git a/PKGBUILD b/PKGBUILD
index 43957f8fd205..9da9f41a724d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,24 +8,24 @@ pkgbase=gdal-hdf4
 _pkgbase=gdal
 provides=('gdal')
 conflicts=('gdal')
-pkgname=('gdal-hdf4' 'python-gdal-hdf4' 'python2-gdal-hdf4')
-pkgver=3.0.0
-pkgrel=2.0
+pkgname=('gdal-hdf4' 'python-gdal-hdf4')
+pkgver=3.0.2
+pkgrel=1.0
 pkgdesc="A translator library for raster geospatial data formats, with support to HDF4 format (required to use MODIStsp tool: http://github.com/lbusett/MODIStsp)"
 arch=('x86_64')
 url="http://www.gdal.org/"
 license=('custom')
 depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg-turbo' 'libpng' 'libspatialite' 'libtiff' 'netcdf' 'hdf4'
          'openjpeg2' 'poppler' 'cfitsio' 'sqlite' 'mariadb-libs' 'postgresql-libs' 'xerces-c' 'json-c')
-makedepends=('perl' 'swig' 'chrpath' 'doxygen' 'python-numpy' 'python2-numpy')
+makedepends=('perl' 'swig' 'chrpath' 'doxygen' 'python-numpy' 'boost')
 optdepends=('postgresql: postgresql database support'
             'mariadb: mariadb database support'
-            'perl:  perl binding support')
+            'perl: perl binding support')
 options=('!emptydirs')
 changelog=$pkgbase.changelog
 source=(https://download.osgeo.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz
         gdal-perl-vendor.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/gdal-perl-vendor.patch?h=packages/gdal)
-sha256sums=('ad316fa052d94d9606e90b20a514b92b2dd64e3142dfdbd8f10981a5fcd5c43e'
+sha256sums=('c3765371ce391715c8f28bd6defbc70b57aa43341f6e94605f04fe3c92468983'
             '2103b98f2f15954f042d5620658b30d703125927bde2e5eb671c5facb6c2f5ed')
 
 prepare() {
@@ -53,7 +53,6 @@ build() {
   make man
 
   cd "${srcdir}"/$_pkgbase-$pkgver/swig/python
-  python2 setup.py build
   python3 setup.py build
 }
 
@@ -89,25 +88,3 @@ package_python-gdal-hdf4 () {
   install -dm755 "${pkgdir}"/usr/share/licenses
   ln -s $_pkgbase "${pkgdir}"/usr/share/licenses/$pkgname
 }
-
-package_python2-gdal-hdf4 () {
-  pkgdesc="Python 2 bindings for GDAL, with support to HDF4 format"
-  provides=("python2-gdal")
-  conflicts=("python2-gdal")
-  depends=("gdal-hdf4=$pkgver" 'python2-numpy')
-  optdepends=()
-
-  cd "${srcdir}"/$_pkgbase-$pkgver/swig/python
-
-# python2 fixes
-  for file in {,osgeo/,samples/,scripts/}*.py; do
-      sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-  done
-
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  install -Dm755 -t "${pkgdir}"/usr/bin scripts/*.py
-  for file in "${pkgdir}"/usr/bin/*; do mv "${file}" "${file%.py}2.py"; done
-
-  install -dm755 "${pkgdir}"/usr/share/licenses
-  ln -s $_pkgbase "${pkgdir}"/usr/share/licenses/$pkgname
-}