From 7d35e1dafffe5f8918cb746ec59c13bd0216dc9c Mon Sep 17 00:00:00 2001 From: lingsheng Date: Thu, 6 May 2021 15:03:53 +0800 Subject: [PATCH] Change BuildRequires to golang --- containernetworking-plugins.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/containernetworking-plugins.spec b/containernetworking-plugins.spec index d57eaf0..500f8ed 100644 --- a/containernetworking-plugins.spec +++ b/containernetworking-plugins.spec @@ -2,13 +2,13 @@ Name: containernetworking-plugins Version: 0.8.6 -Release: 4.git40b4237 +Release: 5.gitad10b6f Summary: Library for use by writing CNI plugin License: ASL 2.0 URL: https://github.com/containernetworking/plugins Source0: https://github.com/containernetworking/plugins/archive/ad10b6fa91aacd720f1f9ab94341a97a82a24965.tar.gz -BuildRequires: compiler(go-compiler) git +BuildRequires: golang git Obsoletes: containernetworking-cni < 0.7.1-2 Provides: containernetworking-cni = %{version}-%{release} kubernetes-cni @@ -58,7 +58,7 @@ export PLUGINS="plugins/meta/* plugins/main/* plugins/ipam/* plugins/sample" for dirpath in $PLUGINS; do if [ -d "$dirpath" ]; then plugin="$(basename "$dirpath")" - %gobuild -o "${PWD}/bin/$plugin" "$@" github.com/containernetworking/plugins/$dirpath + go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -extldflags '%__global_ldflags %{?__golang_extldflags}'" -a -v -x -o "${PWD}/bin/$plugin" "$@" github.com/containernetworking/plugins/$dirpath fi done @@ -143,6 +143,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %doc *.md %changelog +* Thu May 6 2021 lingsheng - 0.8.6-5.gitad10b6f +- Change BuildRequires to golang + * Wed Aug 19 2020 liuzekun - 0.8.6-3.gitad10b6f - Upgrade cni plugins to v0.8.6 -- Gitee