rpm: remove "Conflicts: docker-ee, docker-ee-cli"

Commit e6e563f 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 <[email protected]>
docker · May 10, 2024 · d7198f7 · d7198f7
1 parent 7eab415
commit d7198f7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git 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
@@ -58,7 +58,6 @@ BuildRequires: which
 # conflicting packages
 Conflicts: docker
 Conflicts: docker-io
-Conflicts: docker-ee
 
 # Obsolete packages
 Obsoletes: docker-ce-selinux