From c2a32fd040f7403607682595464f11f17df5f26e Mon Sep 17 00:00:00 2001 From: haozi007 Date: Mon, 8 Feb 2021 14:11:02 +0800 Subject: [PATCH] Change BuildRequires to golang Signed-off-by: haozi007 (cherry picked from commit cdc5f82267c623848067314b6c17a15c3bcaf3d6) --- skopeo.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/skopeo.spec b/skopeo.spec index 8256688..36b64d3 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -30,15 +30,13 @@ ExcludeArch: ppc64 Name: %{repo} Epoch: 1 Version: 1.1.0 -Release: 3.dev.git%{shortcommit0} +Release: 4.dev.git%{shortcommit0} Summary: Work with remote images registries - retrieving information, images, signing content License: ASL 2.0 URL: https://github.com/containers/skopeo Source0: https://github.com/containers/skopeo/archive/v1.1.0.tar.gz -BuildRequires: go-srpm-macros compiler(go-compiler) git pkgconfig(devmapper) make -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: go-srpm-macros golang git pkgconfig(devmapper) make BuildRequires: golang-github-cpuguy83-go-md2man BuildRequires: gpgme-devel libassuan-devel btrfs-progs-devel ostree-devel glib2-devel Requires: containers-common = %{epoch}:%{version}-%{release} @@ -249,7 +247,7 @@ export GOPATH=$(pwd):$(pwd)/vendor:%{gopath} export GO111MODULE=off export GOPROXY=off -%gobuild -o %{name} ./cmd/%{name} +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 %{name} ./cmd/%{name} %{__make} docs %install @@ -332,3 +330,5 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/bash-completion/completions/%{name} %changelog +* Mon Feb 8 2021 haozi007 - 1.1.0-4.dev.git63085f5 +- Change BuildRequires to golang -- Gitee