python 2 and 3

2 files changed, 37 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af44e71afcb0..6be700fa3134 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,26 @@
-pkgbase = python2-htsql
+pkgbase = python-htsql
 	pkgdesc = A comprehensive navigational query language for relational databases.
 	pkgver = 2.3.3
 	pkgrel = 1
 	url = http://htsql.org
 	arch = any
 	license = GPL
-	makedepends = git
-	depends = python2
-	depends = python2-pyaml
+	makedepends = python
+	makedepends = python-setuptools
+	makedepends = python-pyaml
+	makedepends = python2
+	makedepends = python2-setuptools
+	makedepends = python2-pyaml
 	source = http://dist.htsql.org/source/HTSQL-2.3.3.tar.gz
 	md5sums = 34fabf3f4dbc578abba27540491185de
 
+pkgname = python-htsql
+	depends = python
+	depends = python-setuptools
+	depends = python-pyaml
+
 pkgname = python2-htsql
+	depends = python2
+	depends = python2-setuptools
+	depends = python2-pyaml
 
diff --git a/PKGBUILD b/PKGBUILD
index 9c76ca46e989..35aa54b321db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,39 @@
 # Maintainer: Vinicius Correa <vinicius dot correa at zoho dot com>
+
+pkgbase=python-htsql
+pkgname=('python-htsql' 'python2-htsql')
 _pkgname=HTSQL
-pkgname=python2-htsql
 pkgver=2.3.3
 pkgrel=1
 pkgdesc="A comprehensive navigational query language for relational databases."
 arch=('any')
 url="http://htsql.org"
 license=('GPL')
-depends=('python2' 'python2-pyaml')
-makedepends=('git')
-optdepends=()
-conflicts=()
+makedepends=('python' 'python-setuptools' 'python-pyaml'
+             'python2' 'python2-setuptools' 'python2-pyaml')
 source=("http://dist.htsql.org/source/${_pkgname}-${pkgver}.tar.gz")
 md5sums=('34fabf3f4dbc578abba27540491185de')
 
+prepare() {
+  cp -a ${_pkgname}-${pkgver}{,-py2}
+}
+
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
+  python setup.py build
+
+  cd "${srcdir}/${_pkgname}-${pkgver}-py2"
   python2 setup.py build
 }
 
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+package_python-htsql() {
+  depends=('python' 'python-setuptools' 'python-pyaml')
+  cd ${_pkgname}-${pkgver}
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python2-htsql() {
+  depends=('python2' 'python2-setuptools' 'python2-pyaml')
+  cd ${_pkgname}-${pkgver}-py2
+  python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }