diff --git a/moby.spec b/moby.spec index f50f96967c05419b29e429d2dd8a9855ae1cc152..0ec5588b1a576ff86429bcbf8aaa5826cfb5afed 100644 --- a/moby.spec +++ b/moby.spec @@ -7,7 +7,7 @@ Name: docker Version: 25.0.3 -Release: 13 +Release: 14 Summary: The open-source application container engine License: ASL 2.0 URL: https://www.docker.com @@ -28,8 +28,8 @@ Patch0003: 0004-fix-docker-swarm-run-failed-for-loongarch64.patch Patch9000: backport-CVE-2024-41110.patch Patch9001: backport-tini.c-a-function-declaration-without-a-prototype-is.patch -Requires: %{name}-engine = %{version}-%{release} -Requires: %{name}-client = %{version}-%{release} +Requires(meta): %{name}-engine = %{version}-%{release} +Requires(meta): %{name}-client = %{version}-%{release} # conflicting packages Conflicts: docker-ce @@ -44,7 +44,7 @@ lightweight container. %package engine Summary: Docker daemon binary and related utilities -Requires(post): /usr/sbin/groupadd +Requires(pre): /usr/sbin/groupadd Requires: runc Requires: container-selinux >= 2:2.74 Requires: libseccomp >= 2.3 @@ -186,12 +186,14 @@ install -p -m 644 %{_builddir}/%{_source_client}/{LICENSE,MAINTAINERS,NOTICE,REA %{_datadir}/fish/vendor_completions.d/docker.fish %doc %{_pkgdocdir} -%post engine -%systemd_post docker.service +%pre engine if ! getent group docker > /dev/null; then groupadd --system docker fi +%post engine +%systemd_post docker.service + %preun engine %systemd_preun docker.service docker.socket @@ -199,6 +201,13 @@ fi %systemd_postun_with_restart docker.service %changelog +* Wed Nov 06 2024 Funda Wang - 25.0.3-14 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: move group creation into pre section rather than post section + change requires into meta dependency for its actual use + * Tue Nov 05 2024 Funda Wang - 25.0.3-13 - Type:bugfix - ID:NA