simplifications and corrections

2 files changed, 12 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8b66ca9094af..c0a2d2efdb21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-sqlalchemy-git
 	pkgdesc = Python SQL toolkit and Object Relational Mapper
-	pkgver = 2.0.0b1.rc14697.79e047806
+	pkgver = 2.0.0b1.r14754.a869dc8fe
 	pkgrel = 1
 	url = http://www.sqlalchemy.org
 	arch = i686
@@ -8,13 +8,11 @@ pkgbase = python-sqlalchemy-git
 	license = custom:MIT
 	makedepends = git
 	makedepends = python
-	makedepends = python2
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
+	depends = python
+	provides = python-sqlalchemy=2.0.0b1.r14754.a869dc8fe
+	conflicts = python-sqlalchemy
 	source = git+https://github.com/sqlalchemy/sqlalchemy.git
 	md5sums = SKIP
 
 pkgname = python-sqlalchemy-git
-	depends = python
-	provides = python-sqlalchemy=2.0.0b1.rc14697.79e047806
-	conflicts = python-sqlalchemy
diff --git a/PKGBUILD b/PKGBUILD
index 5694e80a8ad5..5f0d98e3242f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,22 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
-pkgname=('python-sqlalchemy-git')
-pkgver=2.0.0b1.rc14697.79e047806
+pkgname=python-sqlalchemy-git
+pkgver=2.0.0b1.r14754.a869dc8fe
 pkgrel=1
 pkgdesc="Python SQL toolkit and Object Relational Mapper"
 arch=('i686' 'x86_64')
 url="http://www.sqlalchemy.org"
 license=('custom:MIT')
-makedepends=('git' 'python' 'python2' 'python-setuptools' 'python2-setuptools')
+provides=("python-sqlalchemy=$pkgver")
+conflicts=('python-sqlalchemy')
+depends=('python')
+makedepends=('git' 'python' 'python-setuptools')
 source=("git+https://github.com/sqlalchemy/sqlalchemy.git")
 md5sums=('SKIP')
 
 pkgver() {
   cd sqlalchemy
-  printf %s.rc%s.%s "$(awk '/\:version\:/ {print $2}' doc/build/changelog/changelog_*|sort|tail -1)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  cp -r sqlalchemy sqlalchemy2
+  printf %s.r%s.%s "$(awk '/:version:/ {print $2}' doc/build/changelog/changelog_*|sort|tail -1)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
@@ -25,10 +24,7 @@ build() {
   python setup.py build
 }
 
-package_python-sqlalchemy-git() {
-  provides=("python-sqlalchemy=$pkgver")
-  conflicts=('python-sqlalchemy')
-  depends=('python')
+package() {
   cd sqlalchemy
   python setup.py install --root="$pkgdir"
   install -D -m644 LICENSE \