Add "conflicts htop"

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0cb7cbe4d712..0d042a22a8ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = htop-zfs
 	pkgdesc = Interactive process viewer with ZFS awareness patch
 	pkgver = 2.2.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://hisham.hm/htop/
 	arch = x86_64
 	license = GPL
@@ -11,6 +11,7 @@ pkgbase = htop-zfs
 	optdepends = lsof: show files opened by a process
 	optdepends = strace: attach to a running process
 	provides = htop
+	conflicts = htop
 	options = !emptydirs
 	options = debug
 	source = https://hisham.hm/htop/releases/2.2.0/htop-2.2.0.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 7c6d5d6cb7ab..4227919d1ebc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,13 @@
 
 pkgname=htop-zfs
 pkgver=2.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Interactive process viewer with ZFS awareness patch'
 arch=('x86_64')
 url='https://hisham.hm/htop/'
 license=('GPL')
 provides=('htop')
+conflicts=('htop')
 depends=('ncurses' 'libnl')
 makedepends=('python')
 optdepends=('lsof: show files opened by a process'