updated to 0.5.2

2 files changed, 45 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c3226802c8c..5101f3251ccb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,23 @@
 # Generated by mksrcinfo v8
-# Thu Mar  2 19:31:31 UTC 2017
+# Fri Sep 15 09:09:18 UTC 2017
 pkgbase = python-pywavelets
 	pkgdesc = Discrete Wavelet Transforms in Python
-	pkgver = 0.5.0
+	pkgver = 0.5.2
 	pkgrel = 1
 	url = https://github.com/PyWavelets/pywt
-	arch = any
+	arch = x86_64
+	arch = i686
 	license = MIT
 	makedepends = python-setuptools
+	makedepends = python2-setuptools
 	makedepends = cython
-	depends = python
-	depends = python-numpy
-	source = https://github.com/PyWavelets/pywt/archive/v0.5.0.tar.gz
-	sha256sums = 99157c11df6c8fb37ca159ce644190a0b9d0c62c830f8a0e2dbe948819c093f3
+	makedepends = cython2
+	makedepends = python-numpy
+	makedepends = python2-numpy
+	source = https://github.com/PyWavelets/pywt/archive/v0.5.2.tar.gz
+	sha256sums = e36d629f40f7781da2dcaa2139bc476e9deaf91d79f675b5ce0bde6e775d1b53
 
 pkgname = python-pywavelets
+	depends = python
+	depends = python-numpy
 
diff --git a/PKGBUILD b/PKGBUILD
index 1b318ad9397a..52ead603c839 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,51 @@
-# Contributor: Francois Boulogne <fboulogne at april dot org>
 # Maintainer: Francois Boulogne <fboulogne at april dot org>
-
+# Contributor: Jingbei Li <i@jingbei.li>
+pkgbase=python-pywavelets
+#pkgname=(python-pywavelets python2-pywavelets)
 pkgname=python-pywavelets
 _pkgname=pywt
-pkgver=0.5.0
+pkgver=0.5.2
 pkgrel=1
 pkgdesc="Discrete Wavelet Transforms in Python"
-arch=('any')
+arch=('x86_64' 'i686')
 url="https://github.com/PyWavelets/pywt"
 license=('MIT')
-depends=('python' 'python-numpy')
-makedepends=('python-setuptools' 'cython')
-source=(https://github.com/PyWavelets/pywt/archive/v$pkgver.tar.gz)
-sha256sums=('99157c11df6c8fb37ca159ce644190a0b9d0c62c830f8a0e2dbe948819c093f3')
+makedepends=('python-setuptools' 'python2-setuptools' 'cython' 'cython2' 'python-numpy' 'python2-numpy')
+source=("https://github.com/PyWavelets/pywt/archive/v$pkgver.tar.gz")
+sha256sums=('e36d629f40f7781da2dcaa2139bc476e9deaf91d79f675b5ce0bde6e775d1b53')
+
+prepare() {
+  cd "$srcdir/"
+  cp -a "${_pkgname}-${pkgver}" "${_pkgname}-${pkgver}-py2"
+  cd "${_pkgname}-${pkgver}-py2"
+  sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+    -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
+    -i $(find . -name '*.py')
+}
 
 build() {
+  msg "Building Python 2"
+  cd "$srcdir/${_pkgname}-${pkgver}-py2"
+  python2 setup.py build
+
+  msg "Building Python 3"
   cd "$srcdir/$_pkgname-$pkgver"
   python setup.py build
 }
 
-package(){
+package_python2-pywavelets(){
+  depends=('python2' 'python2-numpy')
+  cd "$srcdir/$_pkgname-$pkgver-py2"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python-pywavelets(){
+  depends=('python' 'python-numpy')
   cd "$srcdir/$_pkgname-$pkgver"
   python setup.py install --root="$pkgdir/" --optimize=1
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:ts=2:sw=2:et: