add conflicts field

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52868629999e..823261257665 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-tornado-4
 	pkgdesc = open source version of the scalable, non-blocking web server and tools
 	pkgver = 4.5.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.tornadoweb.org/
 	arch = x86_64
 	license = Apache
@@ -13,6 +13,7 @@ pkgbase = python-tornado-4
 	optdepends = python-pycurl: for tornado.curl_httpclient
 	optdepends = python-twisted: for tornado.platform.twisted
 	provides = python-tornado=4
+	conflicts = python-tornado
 	source = python-tornado-4-4.5.3.tar.gz::https://github.com/tornadoweb/tornado/archive/v4.5.3.tar.gz
 	sha512sums = d0d0ba53e64254c5d3e78f11d77eb95174a14a78b9207bf3af63c050ad15f814381aaa777b6817cb4635ab5f03e63e95f0c99e8aec045e96a04b0e233447975e
 
diff --git a/PKGBUILD b/PKGBUILD
index 3422852d7301..ac353d1ee6cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=python-tornado-4
 pkgver=4.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc='open source version of the scalable, non-blocking web server and tools'
 arch=('x86_64')
 url='https://www.tornadoweb.org/'
@@ -14,6 +14,7 @@ optdepends=('python-pycurl: for tornado.curl_httpclient'
 makedepends=('python-setuptools')
 checkdepends=('python-pycurl' 'python-mock' 'python-twisted')
 provides=('python-tornado=4')
+conflicts=('python-tornado')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/tornadoweb/tornado/archive/v$pkgver.tar.gz")
 sha512sums=('d0d0ba53e64254c5d3e78f11d77eb95174a14a78b9207bf3af63c050ad15f814381aaa777b6817cb4635ab5f03e63e95f0c99e8aec045e96a04b0e233447975e')