Restored `$conflicts` variable

2 files changed, 5 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 84837117c42a..0796d3f722ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnunet
 	pkgdesc = A framework for secure peer-to-peer networking
 	pkgver = 0.15.0
-	pkgrel = 7
+	pkgrel = 8
 	url = http://gnunet.org
 	arch = i686
 	arch = x86_64
@@ -39,6 +39,8 @@ pkgbase = gnunet
 	optdepends = pbc: for Attribute-Based Encryption (experimental)
 	optdepends = libgabe: for Attribute-Based Encryption (experimental)
 	optdepends = libpabc: for re:claimID zero-knowledge privacy credentials
+	conflicts = gnunet-git
+	conflicts = gnunet-bin
 	options = !makeflags
 	backup = etc/gnunet.conf
 	source = http://ftpmirror.gnu.org/gnunet/gnunet-0.15.0.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 35c37f078f1c..aa19b6c77ac6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,11 +6,12 @@
 
 pkgname='gnunet'
 pkgver='0.15.0'
-pkgrel=7
+pkgrel=8
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
 url="http://${pkgname}.org"
 license=('GPL')
+conflicts=("${pkgname}-git" "${pkgname}-bin")
 depends=('bash' 'which' 'gnutls' 'gnurl' 'libgcrypt' 'libunistring' 'libidn2'
 	'libmicrohttpd' 'jansson' 'nss' 'libtool' 'sqlite' 'zlib' 'libsodium'
 	'openssl' 'libextractor' 'brotli' 'gettext')