Conflict with each other

Both python2 and python3 version installs /usr/bin/jedihttp

2 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30b610e33b29..9e9af0fb6b31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Jul  4 09:27:48 UTC 2016
+# Mon Jul  4 22:03:24 UTC 2016
 pkgbase = python-jedihttp-git
 	pkgdesc = Simple http wrapper around jedi (with yan12125's packaging patch)
 	pkgver = r141.ec6e097
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/vheon/JediHTTP
 	arch = any
 	license = Apache
@@ -11,6 +11,7 @@ pkgbase = python-jedihttp-git
 	depends = python-bottle
 	depends = python-jedi
 	depends = python-waitress
+	conflicts = python2-jedihttp-git
 	source = git+https://github.com/vheon/JediHTTP
 	source = packaging.patch::https://github.com/vheon/JediHTTP/compare/master...yan12125:packaging.patch
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index a072937f5591..7f247ffe01fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=python-jedihttp-git
 pkgver=r141.ec6e097
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple http wrapper around jedi (with yan12125's packaging patch)"
 license=('Apache')
 arch=('any')
@@ -14,6 +14,7 @@ source=('git+https://github.com/vheon/JediHTTP'
         'packaging.patch'::'https://github.com/vheon/JediHTTP/compare/master...yan12125:packaging.patch')
 sha256sums=('SKIP'
             'fe4e479ed0c616608ec35150965f696fa1e9daae1b9209adbb51131dda294f54')
+conflicts=('python2-jedihttp-git')
 
 pkgver() {
   cd "$srcdir/JediHTTP"