From 0dedae715675b6c88782a218f5b3ecec1940a064 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 10 May 2024 13:42:36 +0200 Subject: [PATCH] rpm: remove "Conflicts: docker-ee, docker-ee-cli" Commit e6e563fc93f86bc17a61858ac755e74af1691081 removed conflicts with the docker-ee and docker-ee-cli packages, but didn't remove the equivalents for the RPM packages. docker-ee no longer exists, so it's unlikely users would run into this situation, so let's remove them. Signed-off-by: Sebastiaan van Stijn --- rpm/SPECS/docker-ce-cli.spec | 2 -- rpm/SPECS/docker-ce.spec | 1 - 2 files changed, 3 deletions(-) diff --git a/rpm/SPECS/docker-ce-cli.spec b/rpm/SPECS/docker-ce-cli.spec index 2dfec9c29a..776bea46d2 100644 --- a/rpm/SPECS/docker-ce-cli.spec +++ b/rpm/SPECS/docker-ce-cli.spec @@ -35,8 +35,6 @@ BuildRequires: git # conflicting packages Conflicts: docker Conflicts: docker-io -Conflicts: docker-ee -Conflicts: docker-ee-cli %description Docker is is a product for you to build, ship and run any application as a diff --git a/rpm/SPECS/docker-ce.spec b/rpm/SPECS/docker-ce.spec index c7b60b0b98..1711f689fa 100644 --- a/rpm/SPECS/docker-ce.spec +++ b/rpm/SPECS/docker-ce.spec @@ -58,7 +58,6 @@ BuildRequires: which # conflicting packages Conflicts: docker Conflicts: docker-io -Conflicts: docker-ee # Obsolete packages Obsoletes: docker-ce-selinux