Add conflicts with docker-ee

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 1c0fdb57a4c7d485f301050e140ad57bdf231cde)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>

components/packaging/deb/common/control

@@ -16,7 +16,7 @@ Recommends: aufs-tools,
             git,
             xz-utils,
             ${apparmor:Recommends}
-Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine-cs
+Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine-cs, docker-ee
 Replaces: docker-engine
 Description: Docker: the open-source application container engine
  Docker is an open source project to build, ship and run any application as a

components/packaging/rpm/centos-7/docker-ce.spec

@@ -35,6 +35,7 @@ Requires: device-mapper-libs >= 1.02.90-1
 Conflicts: docker
 Conflicts: docker-io
 Conflicts: docker-engine-cs
+Conflicts: docker-ee
 
 # Obsolete packages
 Obsoletes: docker-ce-selinux

components/packaging/rpm/fedora-24/docker-ce.spec

@@ -36,6 +36,7 @@ Requires: device-mapper-libs >= 1.02.90-1
 Conflicts: docker
 Conflicts: docker-io
 Conflicts: docker-engine-cs
+Conflicts: docker-ee
 
 # Obsolete packages
 Obsoletes: docker-ce-selinux

components/packaging/rpm/fedora-25/docker-ce.spec

@@ -34,6 +34,7 @@ Requires: device-mapper-libs >= 1.02.90-1
 Conflicts: docker
 Conflicts: docker-io
 Conflicts: docker-engine-cs
+Conflicts: docker-ee
 
 # Obsolete packages
 Obsoletes: docker-ce-selinux