Add 'conflicts' option

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 780b3deec986..a899d1310c4a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = compdb
 	pkgdesc = The compilation database Swiss army knife
 	pkgver = 0.1.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Sarcasm/compdb
 	arch = any
 	license = MIT
 	makedepends = python-setuptools
 	depends = python
+	conflicts = compdb-git
 	source = https://github.com/Sarcasm/compdb/archive/v0.1.1.tar.gz
 	md5sums = 7e6c2cade127fa64c4772d639641a50f
 	sha256sums = 1b630fad573e8e4e8e60b77e6f7e7fe1186eb228c47ccbeb21969aebae46e69d
diff --git a/PKGBUILD b/PKGBUILD
index 3daf320b8610..46cf9690cd8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,14 @@
 
 pkgname=compdb
 pkgver=0.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The compilation database Swiss army knife"
 arch=("any")
 url="https://github.com/Sarcasm/$pkgname"
 license=("MIT")
 depends=("python")
 makedepends=("python-setuptools")
+conflicts=("$pkgname-git")
 source=("https://github.com/Sarcasm/$pkgname/archive/v$pkgver.tar.gz")
 md5sums=("7e6c2cade127fa64c4772d639641a50f")
 sha256sums=("1b630fad573e8e4e8e60b77e6f7e7fe1186eb228c47ccbeb21969aebae46e69d")