Add ccnet conflict

2 files changed, 6 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f4b969e4e098..ec8d2de2e9b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue Jan 23 18:24:51 UTC 2018
 pkgbase = ccnet-server
-	pkgdesc = A framework for writing networked applications in C.
+	pkgdesc = Internal communication framework and user/group management for Seafile-server
 	pkgver = 6.2.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/haiwen/ccnet-server
 	arch = i686
 	arch = x86_64
@@ -18,6 +16,7 @@ pkgbase = ccnet-server
 	depends = libsearpc
 	depends = libldap
 	depends = python2
+	conflicts = ccnet
 	source = ccnet-server-v6.2.5-server.tar.gz::https://github.com/haiwen/ccnet-server/archive/v6.2.5-server.tar.gz
 	source = libccnet.pc.patch
 	source = openssl-1.1.diff
diff --git a/PKGBUILD b/PKGBUILD
index 95754e0f7033..f7377b826925 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,14 @@
 
 pkgname=ccnet-server
 pkgver=6.2.5
-pkgrel=1
-pkgdesc="A framework for writing networked applications in C."
+pkgrel=2
+pkgdesc="Internal communication framework and user/group management for Seafile-server"
 arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
 url="https://github.com/haiwen/${pkgname}"
 license=('GPL2')
 depends=('libevent' 'libzdb' 'libsearpc' 'libldap' 'python2')
 makedepends=('vala' 'libmariadbclient')
+conflicts=('ccnet')
 source=("${pkgname}-v${pkgver}-server.tar.gz::${url}/archive/v${pkgver}-server.tar.gz"
         "libccnet.pc.patch"
         "openssl-1.1.diff")