From a2b7721e37627825b389fa1520439f386a77033c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Wed, 22 Jan 2025 19:46:59 +0100 Subject: [PATCH] rpm: Change absolute paths to relative paths The new version of rpm in fc41 now adds a subdirectory. So the hardcoded paths to BUILD were broken, use relative. --- packaging/rpm/SPECS/cri-dockerd.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/rpm/SPECS/cri-dockerd.spec b/packaging/rpm/SPECS/cri-dockerd.spec index a5be5a1c5..c22aa8c79 100644 --- a/packaging/rpm/SPECS/cri-dockerd.spec +++ b/packaging/rpm/SPECS/cri-dockerd.spec @@ -60,11 +60,11 @@ cri-dockerd is a lightweight implementation of the CRI specification which talks %setup -q -c -n src -a 0 %build -cp %{_topdir}/SOURCES/LICENSE /root/rpmbuild/BUILD/src/LICENSE +cp %{_topdir}/SOURCES/LICENSE LICENSE export CRI_DOCKER_GITCOMMIT=%{_gitcommit} mkdir -p /go/src/github.com/Mirantis -ln -s /root/rpmbuild/BUILD/src/app /go/src/github.com/Mirantis/cri-dockerd -cd /root/rpmbuild/BUILD/src/app +ln -s $PWD/app /go/src/github.com/Mirantis/cri-dockerd +cd app GOPROXY="https://proxy.golang.org" GO111MODULE=on go build -ldflags "%{_buildldflags}" %check