From a438006e4f6d2ba7a37d82ffb1782aefd05c4ab1 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Fri, 16 Jun 2017 14:43:17 -0400 Subject: [PATCH] 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 Upstream-commit: 94943b47520aa81bbe30fbc4eb927c79047ef6d2 Component: packaging --- components/packaging/rpm/centos-7/docker-ce.spec | 5 +++++ components/packaging/rpm/fedora-24/docker-ce.spec | 6 ++++++ components/packaging/rpm/fedora-25/docker-ce.spec | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec index 9e79d0f6a4..818b36b773 100644 --- a/components/packaging/rpm/centos-7/docker-ce.spec +++ b/components/packaging/rpm/centos-7/docker-ce.spec @@ -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. diff --git a/components/packaging/rpm/fedora-24/docker-ce.spec b/components/packaging/rpm/fedora-24/docker-ce.spec index 692d870004..d12c39b9a9 100644 --- a/components/packaging/rpm/fedora-24/docker-ce.spec +++ b/components/packaging/rpm/fedora-24/docker-ce.spec @@ -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. diff --git a/components/packaging/rpm/fedora-25/docker-ce.spec b/components/packaging/rpm/fedora-25/docker-ce.spec index 556885b651..56c8f6448e 100644 --- a/components/packaging/rpm/fedora-25/docker-ce.spec +++ b/components/packaging/rpm/fedora-25/docker-ce.spec @@ -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.