Mark docker-*-selinux pkgs as obsolete

These are replaced by `container-selinux` on fedora-25 and centos-7.
Marking these packages as obsolete makes the installation process a bit
smoother, otherwise the user will have to manually uninstall the older
packages to install the new one.

Also makes fedora24 use container-selinux which is now supports labeling
the `dockerd` binary correctly.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 94943b47520aa81bbe30fbc4eb927c79047ef6d2)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
This commit is contained in:
Brian Goff
2017-06-20 06:51:23 +00:00
committed by Andrew Hsu
parent 2df40e7778
commit 29e8b830bb
3 changed files with 16 additions and 0 deletions
@@ -36,6 +36,11 @@ Conflicts: docker
Conflicts: docker-io
Conflicts: docker-engine-cs
# Obsolete packages
Obsoletes: docker-ce-selinux
Obsoletes: docker-engine-selinux
Obsoletes: docker-engine
%description
Docker is an open source project to build, ship and run any application as a
lightweight container.
@@ -27,6 +27,7 @@ Requires: libcgroup
Requires: systemd-units
Requires: tar
Requires: xz
Requires: container-selinux >= 1.10.3-55
# Resolves: rhbz#1165615
Requires: device-mapper-libs >= 1.02.90-1
@@ -36,6 +37,11 @@ Conflicts: docker
Conflicts: docker-io
Conflicts: docker-engine-cs
# Obsolete packages
Obsoletes: docker-ce-selinux
Obsoletes: docker-engine-selinux
Obsoletes: docker-engine
%description
Docker is an open source project to build, ship and run any application as a
lightweight container.
@@ -35,6 +35,11 @@ Conflicts: docker
Conflicts: docker-io
Conflicts: docker-engine-cs
# Obsolete packages
Obsoletes: docker-ce-selinux
Obsoletes: docker-engine-selinux
Obsoletes: docker-engine
%description
Docker is an open source project to build, ship and run any application as a
lightweight container.