Skip to content

Commit 0dedae7

Browse files
committed
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 <github@gone.nl>
1 parent 2651d25 commit 0dedae7

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

rpm/SPECS/docker-ce-cli.spec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ BuildRequires: git
3535
# conflicting packages
3636
Conflicts: docker
3737
Conflicts: docker-io
38-
Conflicts: docker-ee
39-
Conflicts: docker-ee-cli
4038

4139
%description
4240
Docker is is a product for you to build, ship and run any application as a

rpm/SPECS/docker-ce.spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ BuildRequires: which
5858
# conflicting packages
5959
Conflicts: docker
6060
Conflicts: docker-io
61-
Conflicts: docker-ee
6261

6362
# Obsolete packages
6463
Obsoletes: docker-ce-selinux

0 commit comments

Comments
 (0)