update to 0.3.9

2 files changed, 41 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4afc44f1347..d523b7687873 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,26 @@
 pkgbase = python-ipython-sql
 	pkgdesc = Issue SQL commands from IPython.
-	pkgver = 0.3.4
+	pkgver = 0.3.9
 	pkgrel = 1
 	url = https://pypi.python.org/pypi/ipython-sql
 	arch = any
 	license = custom:PYTHON
+	makedepends = ipython
+	makedepends = python-sqlalchemy
+	makedepends = python-prettytable
+	makedepends = python-sqlparse
+	makedepends = ipython2
+	makedepends = python2-sqlalchemy
+	makedepends = python2-prettytable
+	makedepends = python2-sqlparse
+	source = https://files.pythonhosted.org/packages/source/i/ipython-sql/ipython-sql-0.3.9.tar.gz
+	md5sums = 69407492ac7fcb92520e10d24b3b3194
+
+pkgname = python-ipython-sql
 	depends = ipython
 	depends = python-sqlalchemy
 	depends = python-prettytable
 	depends = python-sqlparse
-	source = https://pypi.python.org/packages/source/i/ipython-sql/ipython-sql-0.3.4.tar.gz
-	md5sums = a68076f11ae62197a16ed4000dcbe8d3
-
-pkgname = python-ipython-sql
 
 pkgname = python2-ipython-sql
 	depends = ipython2
diff --git a/PKGBUILD b/PKGBUILD
index c84f13bf6728..95ab8d824830 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,43 @@
-# Maintainer: Jonathan Kotta <jpkotta at gmail dot com>
+# Contributor: Lex Black <autumn-wind@web.de>
+# Contributor: Jonathan Kotta <jpkotta at gmail dot com>
 
+_name=ipython-sql
 pkgbase=python-ipython-sql
 pkgname=(python-ipython-sql python2-ipython-sql)
-pkgver=0.3.4
+pkgver=0.3.9
 pkgrel=1
 pkgdesc="Issue SQL commands from IPython."
 arch=('any')
 url="https://pypi.python.org/pypi/ipython-sql"
 license=('custom:PYTHON')
-depends=('ipython' 'python-sqlalchemy' 'python-prettytable' 'python-sqlparse')
-source=(https://pypi.python.org/packages/source/i/ipython-sql/ipython-sql-$pkgver.tar.gz)
-md5sums=('a68076f11ae62197a16ed4000dcbe8d3')
-
-_package() {
-  _python=$1
-  cd $srcdir/ipython-sql-$pkgver
-  $_python setup.py install --root="$pkgdir"
+makedepends=('ipython' 'python-sqlalchemy' 'python-prettytable' 'python-sqlparse')
+makedepends+=('ipython2' 'python2-sqlalchemy' 'python2-prettytable' 'python2-sqlparse')
+source=(https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz)
+md5sums=('69407492ac7fcb92520e10d24b3b3194')
+
+
+prepare() {
+  cp -a ${_name}-${pkgver}{,-python2}
+}
+
+build() {
+  cd "${_name}-${pkgver}"
+  python setup.py build
+
+  cd "${srcdir}/${_name}-${pkgver}-python2"
+  python2 setup.py build
 }
 
 package_python-ipython-sql() {
-  _package python
+  depends=('ipython' 'python-sqlalchemy' 'python-prettytable' 'python-sqlparse')
+
+  cd "${_name}-${pkgver}"
+  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
 }
 
 package_python2-ipython-sql() {
-  depends=($(echo ${depends[*]} | sed s/python/python2/g))
-  _package python2
+  depends=('ipython2' 'python2-sqlalchemy' 'python2-prettytable' 'python2-sqlparse')
+
+  cd "${_name}-${pkgver}-python2"
+  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
 }