Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] deb, rpm: remove outdated "conflicts" #1019

Merged
merged 2 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions deb/common/control
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion rpm/SPECS/docker-ce-cli.spec
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ BuildRequires: git
# conflicting packages
Conflicts: docker
Conflicts: docker-io
Conflicts: docker-engine-cs
Conflicts: docker-ee
Conflicts: docker-ee-cli
Comment on lines 38 to 39
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm.. guessing these could also be removed now; it looks like they're already gone from the deb packages, so perhaps we forgot to remove them here 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


Expand Down
1 change: 0 additions & 1 deletion rpm/SPECS/docker-ce.spec
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ BuildRequires: which
# conflicting packages
Conflicts: docker
Conflicts: docker-io
Conflicts: docker-engine-cs
Conflicts: docker-ee

# Obsolete packages
Expand Down
Loading