fix conflict

2 files changed, 10 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31a48c075f19..80af15ca8294 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-sqlalchemy-git
 	pkgdesc = Python SQL toolkit and Object Relational Mapper
 	pkgver = 1.2.0rc11294.1abc8e550
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.sqlalchemy.org
 	arch = i686
 	arch = x86_64
@@ -9,12 +9,14 @@ pkgbase = python-sqlalchemy-git
 	makedepends = git
 	makedepends = python-setuptools
 	depends = python
-	provides = python-sqlalchemy=1.2.0rc11294.1abc8e550
-	conflicts = python-sqlalchemy
 	source = git+https://bitbucket.org/zzzeek/sqlalchemy.git
 	md5sums = SKIP
 
 pkgname = python-sqlalchemy-git
+	provides = python-sqlalchemy=1.2.0rc11294.1abc8e550
+	conflicts = python-sqlalchemy
 
 pkgname = python2-sqlalchemy-git
+	provides = python2-sqlalchemy=1.2.0rc11294.1abc8e550
+	conflicts = python2-sqlalchemy
 
diff --git a/PKGBUILD b/PKGBUILD
index 7554e41eca26..42c1befebc72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,13 @@
 
 pkgname=('python-sqlalchemy-git' 'python2-sqlalchemy-git')
 pkgver=1.2.0rc11294.1abc8e550
-pkgrel=1
+pkgrel=2
 pkgdesc="Python SQL toolkit and Object Relational Mapper"
 arch=('i686' 'x86_64')
 url="http://www.sqlalchemy.org"
 license=('custom:MIT')
 depends=('python')
 makedepends=('git' 'python-setuptools')
-provides=("python-sqlalchemy=$pkgver")
-conflicts=('python-sqlalchemy')
 source=("git+https://bitbucket.org/zzzeek/sqlalchemy.git")
 md5sums=('SKIP')
 
@@ -32,6 +30,8 @@ build() {
 }
 
 package_python-sqlalchemy-git() {
+  provides=("python-sqlalchemy=$pkgver")
+  conflicts=('python-sqlalchemy')
   cd sqlalchemy
   python setup.py install --root="$pkgdir"
   install -D -m644 LICENSE \
@@ -39,6 +39,8 @@ package_python-sqlalchemy-git() {
 }
 
 package_python2-sqlalchemy-git() {
+  provides=("python2-sqlalchemy=$pkgver")
+  conflicts=('python2-sqlalchemy')
   cd sqlalchemy2
   python2 setup.py install --root="$pkgdir"
   install -D -m644 LICENSE \