Date: Monday, October 1, 2018 @ 12:31:51
Author: jlichtblau
Revision: 388840
upgpkg: python-basemap 1.2.0-1 - new upstream release
Modified:
python-basemap/trunk/PKGBUILD
----------+
PKGBUILD | 36 +++++++++++++++---------------------
1 file changed, 15 insertions(+), 21 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-10-01 12:26:47 UTC (rev 388839)
+++ PKGBUILD 2018-10-01 12:31:51 UTC (rev 388840)
@@ -5,15 +5,16 @@
pkgbase=python-basemap
pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common')
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
arch=('x86_64')
url="https://matplotlib.org/basemap/";
license=('MIT')
-makedepends=('cython' 'python2-numpy' 'python-numpy' 'geos' 'shapelib')
-source=($pkgname-$pkgver.tar.gz::https://github.com/matplotlib/basemap/archive/v$pkgver.tar.gz
+makedepends=('cython' 'python2-numpy' 'python-numpy' 'geos' 'shapelib'
+ 'python2-pyproj' 'python-pyproj' 'python2-setuptools'
'python-setuptools')
+source=($pkgname-$pkgver.tar.gz::https://github.com/matplotlib/basemap/archive/v${pkgver}rel.tar.gz
LICENSE)
-sha256sums=('6acdc3a08bfcebf0a1b52a05d73d51b7aa5e7240fedfa95537c92d16f2ef8778'
+sha256sums=('bd5bf305918a2eb675939873b735238f9e3dfe6b5c290e37c41e5b082ff3639a'
'0deac85afb0740df7626b6d8d7aa4b8814bbe9a412fb1a0e5962895d17e63add')
_py2basever=2.7
@@ -20,7 +21,7 @@
_py3basever=3.7
prepare() {
- pushd "${srcdir}"/basemap-${pkgver}
+ pushd "${srcdir}"/basemap-${pkgver}rel
# regenerate cythonized sources for python 3.7
cythonize --force src/_geoslib.pyx
# Remove the bundled libraries and common data
@@ -28,17 +29,17 @@
sed -i "s/lib64/lib/g" setup.py
popd
- cp -a "${srcdir}"/basemap-${pkgver}{,-python2}
+ cp -a "${srcdir}"/basemap-${pkgver}rel{,-python2}
}
build() {
# Python2 Version
- cd "${srcdir}"/basemap-${pkgver}-python2
+ cd "${srcdir}"/basemap-${pkgver}rel-python2
python2 setup.py config
python2 setup.py build
# Python3 Version
- cd "${srcdir}"/basemap-${pkgver}
+ cd "${srcdir}"/basemap-${pkgver}rel
python setup.py config
python setup.py build
}
@@ -45,17 +46,14 @@
package_python2-basemap() {
pkgdesc="Toolkit for plotting data on map projections"
- depends=('python-basemap-common' 'python2-matplotlib' 'geos' 'shapelib'
'python2-numpy' 'python2-httplib2')
+ depends=('python-basemap-common' 'python2-matplotlib' 'geos' 'shapelib'
'python2-numpy' 'python2-httplib2' 'python2-pyproj')
optdepends=('python2-pillow: Python Imaging Library is only needed for
bluemarble and warpimage methods.')
- cd "${srcdir}"/basemap-${pkgver}-python2
+ cd "${srcdir}"/basemap-${pkgver}rel-python2
python2 setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
install -Dm644 "${srcdir}"/LICENSE
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-# Conflict with files from python2-matplotlib
- rm
"${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/__init__.{py,pyc,pyo}
-
rm -fr
"${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data
ln -sf /usr/share/basemap/data
"${pkgdir}"/usr/lib/python${_py2basever}/site-packages/mpl_toolkits/basemap/data
}
@@ -62,18 +60,14 @@
package_python-basemap() {
pkgdesc="Toolkit for plotting data on map projections"
- depends=('python-basemap-common' 'python-matplotlib' 'geos' 'shapelib'
'python-numpy' 'python-httplib2')
+ depends=('python-basemap-common' 'python-matplotlib' 'geos' 'shapelib'
'python-numpy' 'python-httplib2' 'python-pyproj')
optdepends=('python-pillow: Python Imaging Library is only needed for
bluemarble and warpimage methods.')
- cd "${srcdir}"/basemap-${pkgver}
+ cd "${srcdir}"/basemap-${pkgver}rel
python setup.py install -O1 --skip-build --root="${pkgdir}" --prefix=/usr
install -Dm644 "${srcdir}"/LICENSE
"${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-# Conflict with files from python-matplotlib
- rm
"${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/__init__.py
- rm
"${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/__pycache__/__init__.cpython-3?.pyc
-
rm -fr
"${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data
ln -sf /usr/share/basemap/data
"${pkgdir}"/usr/lib/python${_py3basever}/site-packages/mpl_toolkits/basemap/data
}
@@ -82,7 +76,7 @@
pkgdesc="Data files for python-basemap"
license=('GPL2')
- cd "${srcdir}"/basemap-${pkgver}
+ cd "${srcdir}"/basemap-${pkgver}rel
install -dm755 "${pkgdir}"/usr/share/basemap
cp -a lib/mpl_toolkits/basemap/data/ "${pkgdir}"/usr/share/basemap/
