2 files changed, 14 insertions, 18 deletions
diff --git a/abs/core/python_modules/python-flask/PKGBUILD b/abs/core/python_modules/python-flask/PKGBUILD
index dc2cb23..8dc26b8 100644
--- a/abs/core/python_modules/python-flask/PKGBUILD
+++ b/abs/core/python_modules/python-flask/PKGBUILD
@@ -4,45 +4,42 @@
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Tarmo Heiskanen <turskii@gmail.com>
 
-pkgname=('python2-flask')
+pkgbase=python-flask
+pkgname=('python-flask' 'python2-flask')
 pkgver=0.12.2
-pkgrel=2
+pkgrel=4
 pkgdesc='Micro webdevelopment framework for Python'
 url='http://flask.pocoo.org/'
 arch=('any')
 license=('custom:BSD')
-makedepends=('python2-setuptools')
-source=("https://github.com/pallets/flask/archive/${pkgver}.tar.gz")
+makedepends=('python-setuptools' 'python2-setuptools')
+source=("https://github.com/pallets/flask/archive/0.12.2.tar.gz")
 sha512sums=('5007129eed63902a39c6652f0868348629f3f6e09d38a764a6ed0e77f6e87f0a28068cfeee6ecb2dee92ccee771d57f42ba816f856e49f08b8c1dfe6bde9873c')
 
 prepare() {
-#  cp -r "flask-$pkgver" "python-flask-$pkgver"
+  cp -r "flask-$pkgver" "python-flask-$pkgver"
   cp -r "flask-$pkgver" "python2-flask-$pkgver"
 }
 
-build_python-flask() {
-  cd "$pkgname-$pkgver"
-
+buildk() {
+  cd "$srcdir/python-flask-$pkgver"
   python setup.py build
-}
-
-build_python2-flask() {
-  cd "$pkgname-$pkgver"
 
+  cd "$srcdir/python2-flask-$pkgver"
   python setup.py build
 }
 
-check_python-flask() {
-  cd "$pkgname-$pkgver"
+check() {
+  cd "$srcdir/python-flask-$pkgver"
   python setup.py test
 
-  cd "$pkgname-$pkgver"
+  cd "$srcdir/python2-flask-$pkgver"
   python2 setup.py test
 }
 
 package_python-flask() {
   depends=('python-werkzeug' 'python-jinja' 'python-itsdangerous' 'python-click')
-  cd "$pkgname-$pkgver"
+  cd "$srcdir/python-flask-$pkgver"
 
   python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -50,7 +47,7 @@ package_python-flask() {
 
 package_python2-flask() {
   depends=('python2-werkzeug' 'python2-jinja' 'python2-itsdangerous' 'python2-click')
-  cd "$pkgname-$pkgver"
+  cd "$srcdir/python2-flask-$pkgver"
 
   python2 setup.py install --root="$pkgdir" --optimize=1
   mv "$pkgdir"/usr/bin/flask "$pkgdir"/usr/bin/flask2
diff --git a/abs/core/python_modules/python-flask/__changelog b/abs/core/python_modules/python-flask/__changelog
deleted file mode 100644
index 60db758..0000000
--- a/abs/core/python_modules/python-flask/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-PKGBUILD: remove py3 stuff