Conflict with containerd package.

2 files changed, 4 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c75a7c9d8b10..9f9d9d77f1ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Jun 23 03:04:28 UTC 2016
+# Wed Aug 24 07:50:02 UTC 2016
 pkgbase = containerd-git
 	pkgdesc = A daemon to control runC, built for performance and density
 	pkgver = v0.2.0.r95.g3d90005
@@ -12,8 +12,10 @@ pkgbase = containerd-git
 	makedepends = git
 	depends = glibc
 	depends = runc-git
+	conflicts = containerd
 	replaces = containerd
 	source = git+https://github.com/docker/containerd.git
 	md5sums = SKIP
 
 pkgname = containerd-git
+
diff --git a/PKGBUILD b/PKGBUILD
index 2fa8f6282a0f..4979fc22acae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,6 +7,7 @@ pkgver=v0.2.0.r95.g3d90005
 pkgrel=1
 pkgdesc='A daemon to control runC, built for performance and density'
 url='https://containerd.tools/'
+conflicts=('containerd')
 depends=('glibc' 'runc-git')
 makedepends=('go' 'git')
 replaces=('containerd')