diff --git a/moby.spec b/moby.spec index ea316d9dd637278e5aa9ab3cbdfc6f820caeaa1c..1908931e3c358e29bf035365ab16a3255799e914 100644 --- a/moby.spec +++ b/moby.spec @@ -7,7 +7,7 @@ Name: moby Version: 20.10.24 -Release: 3 +Release: 4 Summary: The open-source application container engine License: ASL 2.0 URL: https://www.docker.com @@ -33,8 +33,10 @@ Requires: %{name}-client = %{version}-%{release} # conflicting packages Conflicts: docker-ce Conflicts: docker-io +Conflicts: docker-engine Conflicts: docker-engine-cs Conflicts: docker-ee +Conflicts: libnetwork %description Docker is a product for you to build, ship and run any application as a @@ -210,6 +212,9 @@ fi %systemd_postun_with_restart docker.service %changelog +* Thu Aug 31 2023 xulei - 20.10.24-4 +- DESC: Fix the conflict between libnetwork and docker-engine installation. + * Fri Aug 18 2023 jiangxinyu - 20.10.24-3 - Fix build error