Conflict with orhun's non-git package

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56e885363d4f..9a3882224243 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = frankenwm-git
 	pkgdesc = Fast dynamic tiling window manager based on monsterwm-xcb
 	pkgver = 1.0.22
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/sulami/FrankenWM
 	arch = i686
 	arch = x86_64
@@ -14,6 +14,7 @@ pkgbase = frankenwm-git
 	depends = xcb-util
 	source = git+https://github.com/sulami/FrankenWM.git
 	md5sums = SKIP
+        conflicts = frankenwm
 
 pkgname = frankenwm-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1ebfc75a1636..7bc8c6637885 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=frankenwm-git
 _gitname="FrankenWM"
 pkgver=1.0.22
-pkgrel=2
+pkgrel=3
 pkgdesc="Fast dynamic tiling window manager based on monsterwm-xcb"
 url="https://github.com/sulami/FrankenWM"
 arch=('i686' 'x86_64')
@@ -13,6 +13,7 @@ depends=('xcb-util-wm' 'xcb-util-keysyms' 'libx11' 'libxcb' 'xcb-util')
 makedepends=('git')
 source=("git+https://github.com/sulami/FrankenWM.git")
 md5sums=("SKIP")
+conflicts=("${pkgname%-git}")
 
 prepare() {
   cd "$srcdir/$_gitname"