Merge pull request #1019 from thaJeztah/simplify_conflicts

[master] deb, rpm: remove outdated "conflicts"
docker · May 10, 2024 · 2651d25 · 2651d25
2 parents 8deb73e + 7eab415
commit 2651d25
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/deb/common/control b/deb/common/control
@@ -41,10 +41,7 @@ Recommends: apparmor,
 Suggests: aufs-tools [amd64], cgroupfs-mount | cgroup-lite
 Conflicts: docker (<< 1.5~),
            docker-engine,
-           docker-engine-cs,
-           docker.io,
-           lxc-docker,
-           lxc-docker-virtual-package
+           docker.io
 Replaces: docker-engine
 Description: Docker: the open-source application container engine
  Docker is a product for you to build, ship and run any application as a
@@ -64,10 +61,7 @@ Recommends: docker-buildx-plugin,
             docker-compose-plugin
 Conflicts: docker (<< 1.5~),
            docker-engine,
-           docker-engine-cs,
-           docker.io,
-           lxc-docker,
-           lxc-docker-virtual-package
+           docker.io
 Replaces: docker-ce (<< 5:0)
 Breaks: docker-ce (<< 5:0)
 Description: Docker CLI: the open-source application container engine

diff --git a/rpm/SPECS/docker-ce-cli.spec b/rpm/SPECS/docker-ce-cli.spec
@@ -35,7 +35,6 @@ BuildRequires: git
 # conflicting packages
 Conflicts: docker
 Conflicts: docker-io
-Conflicts: docker-engine-cs
 Conflicts: docker-ee
 Conflicts: docker-ee-cli
 

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-engine-cs
 Conflicts: docker-ee
 
 # Obsolete packages