From 9fcf8b31319daff80ab570a2bf6f6fca9083859a Mon Sep 17 00:00:00 2001 From: si-gui <245140120@qq.com> Date: Wed, 9 Sep 2020 11:50:59 +0800 Subject: [PATCH] Add conflicts with docker-engine for help package --- podman.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/podman.spec b/podman.spec index ab55108..0b388c0 100644 --- a/podman.spec +++ b/podman.spec @@ -1,6 +1,6 @@ Name: podman Version: 0.10.1 -Release: 3 +Release: 4 Summary: A daemonless container engine for managing Containers Epoch: 1 License: ASL 2.0 @@ -141,7 +141,8 @@ Conflicts: docker docker-latest docker-ce docker-ee moby-engine This package installs a script named docker, which emulates the Docker CLI through podman command. %package help -Summary: Help document for the podman package +Summary: Help document for the podman package +Conflicts: docker docker-latest docker-ce docker-ee moby-engine %description help Help document for the podman package @@ -209,6 +210,9 @@ install -Dp -m644 libpod.conf %{buildroot}%{_datadir}/containers/libpod.conf %{_mandir}/man5/*.5* %changelog +* Wed Sep 9 2020 Guoshuai Sun - 1:0.10.1-4 +- Add conflicts with docker-engine for help package + * Thu Mar 12 2020 Ling Yang - 1:0.10.1-3 - Fixed install fail -- Gitee