fix conflict

2 files changed, 9 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe1451de611c..954f2c9d9ee1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Nov 20 10:21:12 UTC 2016
+# Sun Nov 20 10:23:49 UTC 2016
 pkgbase = python-pygmail-git
 	pkgdesc = A Pythonic interface for Google Mail
 	pkgver = r73.4626823
@@ -9,14 +9,16 @@ pkgbase = python-pygmail-git
 	license = MIT
 	makedepends = python-setuptools
 	makedepends = python2-setuptools
-	provides = python-pygmail
-	conflicts = python-pygmail
 	source = git+https://github.com/charlierguo/gmail.git
 	md5sums = SKIP
 
 pkgname = python-pygmail-git
 	depends = python
+	provides = python-pygmail
+	conflicts = python-pygmail
 
 pkgname = python2-pygmail-git
 	depends = python2
+	provides = python2-pygmail
+	conflicts = python2-pygmail
 
diff --git a/PKGBUILD b/PKGBUILD
index 402cb06016db..39ed05e78603 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,6 @@ url="http://trac.mystic.cacr.caltech.edu/project/pygmail/wiki.html"
 arch=(any)
 license=('MIT')
 makedepends=('python-setuptools' 'python2-setuptools')
-conflicts=('python-pygmail')
-provides=('python-pygmail')
 source=("git+https://github.com/charlierguo/gmail.git")
 md5sums=('SKIP')
 
@@ -37,6 +35,8 @@ build() {
 
 package_python-pygmail-git() {
   depends=('python')
+  conflicts=('python-pygmail')
+  provides=('python-pygmail')
 
   cd "${srcdir}/gmail"
   python setup.py install --root=${pkgdir} --optimize=1
@@ -44,6 +44,8 @@ package_python-pygmail-git() {
 
 package_python2-pygmail-git() {
   depends=('python2')
+  conflicts=('python2-pygmail')
+  provides=('python2-pygmail')
 
   cd "${srcdir}/gmail"
   python2 setup.py install --root=${pkgdir} --optimize=1