From 839d9423732053430033b091377ac0d5464a5e32 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 24 Mar 2023 12:46:47 +0530 Subject: [PATCH] ensure no buildroot macro left in /usr/bin/docker A new change soon to be merged upstream will leave the buildroot macro in /usr/bin/docker in the rpmbuild process. This commit will sanitize the buildroot macro from /usr/bin/docker. Signed-off-by: Lokesh Mandvekar --- podman.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/podman.spec b/podman.spec index 0dbb4e7..3c73148 100644 --- a/podman.spec +++ b/podman.spec @@ -416,6 +416,9 @@ install -dp %{buildroot}%{_libexecdir}/%{name} install -p -m0755 bin/gvproxy %{buildroot}%{_libexecdir}/%{name} cd .. +# Sanitize paths in %%{_bindir}/docker +sed -i 's;%{buildroot}%{_sysconfdir};%{_sysconfdir}/containers;g' %{buildroot}%{_bindir}/docker + # do not include docker and podman-remote man pages in main package for file in `find %{buildroot}%{_mandir}/man[15] -type f | sed "s,%{buildroot},," | grep -v -e remote -e docker`; do echo "$file*" >> podman.file-list