From ded6032e6ee944ecc26efdf892bd0982e18bea7c Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Sat, 23 Nov 2024 19:16:33 +0800
Subject: [PATCH] add requires for docker-proxy rather than installing it
 manually

(cherry picked from commit d24f1ae5d41a4498770851e3d4e2559911fdf0a5)
---
 docker.spec | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/docker.spec b/docker.spec
index ec80a02..669fe83 100644
--- a/docker.spec
+++ b/docker.spec
@@ -1,12 +1,12 @@
 Name: docker-engine
 Version: 18.09.0
-Release: 342
+Release: 343
 Epoch: 2
 Summary: The open-source application container engine
 Group: Tools/Docker
 
-License: ASL 2.0
-Source0: https://github.com/docker/docker-ce/archive/v18.09.0.tar.gz
+License: Apache-2.0
+Source0: https://github.com/docker/docker-ce/archive/v%{version}.tar.gz
 Source1: patch.tar.gz
 Source2: apply-patches
 Source3: git-commit
@@ -24,15 +24,17 @@ URL: https://mobyproject.org
 # most are already in the container (see contrib/builder/rpm/ARCH/generate.sh)
 BuildRequires: pkgconfig(systemd) golang >= 1.8.3 btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel
 BuildRequires: libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel
-BuildRequires: tar containerd runc docker-proxy git
+BuildRequires: tar containerd runc git
 
 # required packages on install
 Requires: /bin/sh iptables tar xz device-mapper-libs >= 1.02.90-1 systemd-units
+Requires: /usr/bin/docker-proxy
 
 # conflicting packages
 Provides: docker
 Conflicts: docker-io
 Conflicts: docker-engine-cs
+%{systemd_requires}
 
 %description
 Docker is an open source project to build, ship and run any application as a
@@ -111,9 +113,6 @@ install -p -m 755 components/engine/bundles/dynbinary-daemon/dockerd $RPM_BUILD_
 # install cli
 install -p -m 755 components/cli/build/docker $RPM_BUILD_ROOT/%{_bindir}/docker
 
-# install proxy
-install -p -m 755 /usr/bin/docker-proxy $RPM_BUILD_ROOT/%{_bindir}/docker-proxy
-
 # install containerd
 install -p -m 755 /usr/bin/containerd $RPM_BUILD_ROOT/%{_bindir}/containerd
 install -p -m 755 /usr/bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/containerd-shim
@@ -168,7 +167,6 @@ install -p -m 644 components/engine/contrib/syntax/nano/Dockerfile.nanorc $RPM_B
 /%{_bindir}/docker
 /%{_bindir}/dockerd
 /%{_bindir}/containerd
-/%{_bindir}/docker-proxy
 /%{_bindir}/containerd-shim
 /%{_bindir}/runc
 /%{_sysconfdir}/udev/rules.d/80-docker.rules
@@ -227,6 +225,9 @@ fi
 %endif
 
 %changelog
+* Sat Nov 23 2024 Funda Wang <fundawang@yeah.net> - 2:18.09.0-343
+- add requires for docker-proxy rather than installing it manually
+
 * Fri Oct 25 2024 zhongjiawei<zhongjiawei1@huawei.com> - 2:18.09.0-342
 - Type:bugfix
 - CVE:NA
-- 
Gitee