add conflict with python2-imaging

2 files changed, 4 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 642ccf3dded7..eca7799dbac9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python2-pillow
 	pkgdesc = Python Imaging Library (PIL) fork
 	pkgver = 6.2.2
-	pkgrel = 2
+	pkgrel = 3
 	url = https://python-pillow.github.io/
 	arch = x86_64
 	arch = i686
@@ -28,6 +28,7 @@ pkgbase = python2-pillow
 	optdepends = tk: for the ImageTK module
 	optdepends = python2-olefile: OLE2 file support
 	optdepends = python2-pyqt5: for the ImageQt module
+	conflicts = python2-imaging
 	source = https://files.pythonhosted.org/packages/source/P/Pillow/Pillow-6.2.2.tar.gz
 	sha256sums = db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950
 
diff --git a/PKGBUILD b/PKGBUILD
index 8651043e373a..3566d2f7e17a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=python2-pillow
 pkgver=6.2.2
-pkgrel=2
+pkgrel=3
 _appname=Pillow
 _py2basever=2.7
 pkgdesc="Python Imaging Library (PIL) fork"
@@ -19,7 +19,7 @@ optdepends=('freetype2: for the ImageFont module'
             'python2-olefile: OLE2 file support'
             'python2-pyqt5: for the ImageQt module')
 makedepends=(python2-setuptools freetype2 libraqm libwebp tk)
-#checkdepends=(python2-pytest)
+conflicts=(python2-imaging)
 source=("https://files.pythonhosted.org/packages/source/P/$_appname/$_appname-$pkgver.tar.gz")
 sha256sums=('db9ff0c251ed066d367f53b64827cc9e18ccea001b986d08c265e53625dab950')