From 10646ff79326542ea14f11d2822d7755acc97ba9 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 12 2016 15:00:07 +0000 Subject: import runc-0.1.0-3.el7 --- diff --git a/.gitignore b/.gitignore index 39a2875..dc3d70e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/runc-4155b68.tar.gz +SOURCES/runc-8e129e0.tar.gz diff --git a/.runc.metadata b/.runc.metadata index 7310e75..f4158f4 100644 --- a/.runc.metadata +++ b/.runc.metadata @@ -1 +1 @@ -ebc30fdff0bd1b49c1cfb48346e4991890050346 SOURCES/runc-4155b68.tar.gz +0084cce17fd8aad3fc1fa4763961a065e74a44c4 SOURCES/runc-8e129e0.tar.gz diff --git a/SPECS/runc.spec b/SPECS/runc.spec index 402f1b2..3bcfc51 100644 --- a/SPECS/runc.spec +++ b/SPECS/runc.spec @@ -25,15 +25,15 @@ # https://github.com/opencontainers/runc %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 4155b68a243558ad83b2e7bd9dcbaea50a9ac345 +%global commit 8e129e097220b2591edd59957c4ff08e064e14b9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: %{repo} %if 0%{?fedora} Epoch: 1 %endif -Version: 0.0.8 -Release: 1.git%{shortcommit}%{?dist} +Version: 0.1.0 +Release: 3%{?dist} Summary: CLI for running Open Containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -44,6 +44,7 @@ ExclusiveArch: 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} BuildRequires: go-md2man +BuildRequires: libseccomp-devel %if ! 0%{?with_bundled} BuildRequires: golang(github.com/Sirupsen/logrus) @@ -165,11 +166,8 @@ export GOPATH=$(pwd):%{gopath} export GOPATH=$(pwd):$(pwd)/Godeps/_workspace:%{gopath} %endif -%if ! 0%{?gobuild:1} -%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; -%endif - -%gobuild -o bin/%{name} %{import_path} +sed -i 's/seccomp/selinux seccomp/' Makefile +make all pushd man ./md2man-all.sh @@ -177,7 +175,7 @@ popd %install install -d -p %{buildroot}%{_bindir} -install -p -m 755 bin/%{name} %{buildroot}%{_bindir} +install -p -m 755 %{name} %{buildroot}%{_bindir} install -d -p %{buildroot}%{_mandir}/man8 install -p -m 644 man/man8/* %{buildroot}%{_mandir}/man8 @@ -272,6 +270,16 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Tue May 03 2016 Lokesh Mandvekar - 0.1.0-3 +- add selinux build tag +- add BR: libseccomp-devel + +* Tue May 03 2016 Lokesh Mandvekar - 0.1.0-2 +- Resolves: #1328970 - add seccomp buildtag + +* Tue Apr 19 2016 Lokesh Mandvekar - 0.1.0-1 +- Resolves: rhbz#1328616 - rebase to v0.1.0 + * Tue Mar 08 2016 Lokesh Mandvekar - 0.0.8-1.git4155b68 - Resolves: rhbz#1277245 - bump to 0.0.8 - Resolves: rhbz#1302363 - criu is a runtime dep