Date: Monday, July 23, 2018 @ 16:40:07
Author: eschwartz
Revision: 363159
upgpkg: python-basemap 1.1.0-2
python 3.7 rebuild
fix licenses
Added:
python-basemap/trunk/LICENSE
Modified:
python-basemap/trunk/PKGBUILD
----------+
LICENSE | 14 ++++++++++++++
PKGBUILD | 26 ++++++++++++++++----------
2 files changed, 30 insertions(+), 10 deletions(-)
Added: LICENSE
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2018-07-23 16:40:07 UTC (rev 363159)
@@ -0,0 +1,14 @@
+copyright (c) 2011 by Jeffrey Whitaker.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notices appear in all copies and that
+both the copyright notices and this permission notice appear in
+supporting documentation.
+THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-07-23 16:36:34 UTC (rev 363158)
+++ PKGBUILD 2018-07-23 16:40:07 UTC (rev 363159)
@@ -7,19 +7,23 @@
pkgbase=python-basemap
pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common')
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url="https://matplotlib.org/basemap/";
-license=('custom')
-makedepends=('python2-numpy' 'python-numpy' 'geos' 'shapelib')
-source=($pkgname-$pkgver.tar.gz::https://github.com/matplotlib/basemap/archive/v$pkgver.tar.gz)
-sha256sums=('6acdc3a08bfcebf0a1b52a05d73d51b7aa5e7240fedfa95537c92d16f2ef8778')
+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
+ LICENSE)
+sha256sums=('6acdc3a08bfcebf0a1b52a05d73d51b7aa5e7240fedfa95537c92d16f2ef8778'
+ '0deac85afb0740df7626b6d8d7aa4b8814bbe9a412fb1a0e5962895d17e63add')
_py2basever=2.7
-_py3basever=3.6
+_py3basever=3.7
-build() {
+prepare() {
pushd "${srcdir}"/basemap-${pkgver}
+# regenerate cythonized sources for python 3.7
+ cythonize --force src/_geoslib.pyx
# Remove the bundled libraries and common data
rm -r geos-*
sed -i "s/lib64/lib/g" setup.py
@@ -26,7 +30,9 @@
popd
cp -a "${srcdir}"/basemap-${pkgver}{,-python2}
+}
+build() {
# Python2 Version
cd "${srcdir}"/basemap-${pkgver}-python2
python2 setup.py config
@@ -46,6 +52,7 @@
cd "${srcdir}"/basemap-${pkgver}-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}
@@ -62,6 +69,7 @@
cd "${srcdir}"/basemap-${pkgver}
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
@@ -73,12 +81,10 @@
package_python-basemap-common() {
pkgdesc="Data files for python-basemap"
+ license=('GPL2')
cd "${srcdir}"/basemap-${pkgver}
install -dm755 "${pkgdir}"/usr/share/basemap
cp -a lib/mpl_toolkits/basemap/data/ "${pkgdir}"/usr/share/basemap/
-
- install -dm755 "${pkgdir}"/usr/share/licenses/${pkgbase}
- install -m644 LICENSE_{data,geos} README.md
"${pkgdir}"/usr/share/licenses/${pkgbase}/
}
