From 4a06b35c614d78ed793e55feac451b33a56b00b1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 30 2018 12:37:00 +0000 Subject: import runc-1.0.0-57.dev.git2abd837.el7 --- diff --git a/SPECS/runc.spec b/SPECS/runc.spec index 9558bbe..3053d28 100644 --- a/SPECS/runc.spec +++ b/SPECS/runc.spec @@ -12,7 +12,8 @@ %endif %if ! 0%{?gobuild:1} -%define gobuild(o:) go build -buildmode=pie -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -tags "$BUILDTAGS" -a -v -x %{?**}; +%define gobuild(o:) \ +scl enable go-toolset-1.10 -- go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; %endif %global provider github @@ -28,7 +29,7 @@ Name: %{repo} Version: 1.0.0 -Release: 54.dev.git%{shortcommit0}%{?dist} +Release: 57.dev.git%{shortcommit0}%{?dist} Summary: CLI for running Open Containers License: ASL 2.0 URL: http//%{provider_prefix} @@ -41,14 +42,15 @@ Requires: criu Requires(pre): container-selinux >= 2:2.2-2 ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64 -# 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} >= 1.6.2 -BuildRequires: go-toolset-7-golang-bin -BuildRequires: go-toolset-7-runtime +%if 0%{?fedora} || 0%{?centos} +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +%else +BuildRequires: go-toolset-1.10 +BuildRequires: openssl-devel +%endif #fedora BuildRequires: git BuildRequires: go-md2man BuildRequires: libseccomp-devel -BuildRequires: openssl-devel %if ! 0%{?with_bundled} BuildRequires: golang(github.com/Sirupsen/logrus) @@ -174,8 +176,8 @@ pushd GOPATH/src/%{import_path} export GOPATH=$(pwd)/GOPATH export BUILDTAGS='selinux seccomp' -GOPATH=$GOPATH %gobuild -o %{name} %{import_path} -GOPATH=$GOPATH %gobuild -o recvtty %{import_path}/contrib/cmd/recvtty +%gobuild -o %{name} %{import_path} +%gobuild -o recvtty %{import_path}/contrib/cmd/recvtty pushd man ./md2man-all.sh @@ -287,6 +289,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Wed Nov 28 2018 Lokesh Mandvekar - 1.0.0-57.dev.git2abd837 +- Resolves: #1650512 - build with the right golang dependency + +* Wed Nov 21 2018 Frantisek Kluknavsky - 1.0.0-56.dev.git2abd837 +- openssl-devel required only with scl go toolset + +* Thu Nov 08 2018 Frantisek Kluknavsky - 1.0.0-55.dev.git2abd837 +- buildrequires for centos + * Wed Sep 26 2018 Frantisek Kluknavsky - 1.0.0-54.dev.git2abd837 - 1807.patch added