Add Conflicts: docker-ce-cli

Thanks to Nicolas MURE's patch (#1715254).

moby-engine.spec

@@ -30,7 +30,7 @@
 
 Name: %{newname}-engine
 Version: 18.09.7
-Release: 4.ce.git%{shortcommit_moby}%{?dist}
+Release: 5.ce.git%{shortcommit_moby}%{?dist}
 Summary: The open-source application container engine
 License: ASL 2.0
 # no golang / go-md2man for ppc64
@@ -73,19 +73,13 @@ Requires: containerd
 # Resolves: rhbz#1165615
 Requires: device-mapper-libs >= 1.02.90-1
 
-# Replace the old Docker packages
-Obsoletes: %{origname} < %{version}-%{release}
-Obsoletes: %{origname}-latest < %{version}-%{release}
-Provides: %{origname} = %{version}-%{release}
-Provides: %{origname}-latest = %{version}-%{release}
-
 # conflicting packages
 Conflicts: %{origname}
-Conflicts: %{origname}-latest
 Conflicts: %{origname}-common
 Conflicts: %{origname}-io
 Conflicts: %{origname}-engine-cs
 Conflicts: %{origname}-ce
+Conflicts: %{origname}-ce-cli
 Conflicts: %{origname}-ee
 
 %description
@@ -104,8 +98,6 @@ Summary: Fish completion files for %{name}
 Requires: %{name} = %{version}-%{release}
 Requires: fish
 Conflicts: %{service_name}-fish-completion
-Obsoletes: %{service_name}-fish-completion < %{version}-%{release}
-Provides: %{service_name}-fish-completion = %{version}-%{release}
 
 %description fish-completion
 This package installs %{summary}.
@@ -115,8 +107,6 @@ Summary: Vim syntax highlighting files for %{name}
 Requires: %{name} = %{version}-%{release}
 Requires: vim
 Conflicts: %{service_name}-vim
-Obsoletes: %{service_name}-vim < %{version}-%{release}
-Provides: %{service_name}-vim = %{version}-%{release}
 
 %description vim
 This package installs %{summary}.
@@ -126,8 +116,6 @@ Summary: Zsh completion files for %{name}
 Requires: %{name} = %{version}-%{release}
 Requires: zsh
 Conflicts: %{service_name}-zsh-completion
-Obsoletes: %{service_name}-zsh-completion < %{version}-%{release}
-Provides: %{service_name}-zsh-completion = %{version}-%{release}
 
 %description zsh-completion
 This package installs %{summary}.
@@ -300,14 +288,18 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || :
 %{_datadir}/nano/Dockerfile.nanorc
 
 %changelog
-* Sat Jul 13 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-3.ce.git2d0083d
+* Mon Mar 09 2020 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-5.ce.git2d0083d
+- Add Conflicts: docker-ce-cli
+
+* Sat Jul 13 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-4.ce.git2d0083d
 - Add nofile ulimit to default docker daemon options (#1715254, #1708115)
 
-* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-4.ce.git2d0083d
-- rebuilt
+* Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-3.ce.git2d0083d
+- Remove obsolete for docker/docker-latest for f30
 
 * Fri Jul 12 2019 Olivier Lemasle <o.lemasle@gmail.com> - 18.09.7-2.ce.git2d0083d
 - Depend on packaged versions "runc" and "containerd" instead of building them.
+- Obsolete and provide the docker and docker-latest packages. (#1700006)
 
 * Thu Jun 27 2019 David Michael <dm0@redhat.com> - 18.09.7-1.ce.git2d0083d
 - Update docker-ce to commit 2d0083d (version 18.09.7).
@@ -318,7 +310,6 @@ getent group %{service_name} >/dev/null || groupadd -r %{service_name} || :
 * Tue May 14 2019 David Michael <dm0@redhat.com> - 18.09.6-1.ce.git481bc77
 - Update docker-ce to commit 481bc77 (version 18.09.6).
 - Update docker-proxy to commit 872f0a8.
-- Obsolete and provide the docker and docker-latest packages. (#1700006)
 
 * Thu Apr 11 2019 David Michael <dm0@redhat.com> - 18.09.5-1.ce.gite8ff056
 - Update docker-ce to commit e8ff056 (version 18.09.5).