Add conflict with python2-pafy-git package

2 files changed, 2 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9eda040c9c7..5da943e72f55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = python2-pafy
 	depends = python2-youtube-dl
 	provides = python2-pafy
 	conflicts = python-pafy
+	conflicts = python2-pafy-git
 	source = python-pafy-0.5.4.tar.gz::https://github.com/mps-youtube/pafy/archive/v0.5.4.tar.gz
 	sha1sums = bb79fce739f44e6ac0f13911c8e388378fd5fccf
 
diff --git a/PKGBUILD b/PKGBUILD
index fbb87183ef51..b12ced662890 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ license=('GPL3')
 provides=('python2-pafy')
 depends=('python2' 'python2-youtube-dl')
 makedepends=('git' 'python2-setuptools')
-conflicts=('python-pafy')
+conflicts=('python-pafy' 'python2-pafy-git')
 
 source=("python-pafy-$pkgver.tar.gz::https://github.com/mps-youtube/pafy/archive/v$pkgver.tar.gz")
 sha1sums=('bb79fce739f44e6ac0f13911c8e388378fd5fccf')