diff --git a/.gitignore b/.gitignore index bb99c27..1771832 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/runc-5d93f81.tar.gz +SOURCES/runc-e800860.tar.gz diff --git a/.runc.metadata b/.runc.metadata index a39af1c..230827f 100644 --- a/.runc.metadata +++ b/.runc.metadata @@ -1 +1 @@ -2d07a2ecc585678c4739ac6c8c3dc36a7d9f6ea6 SOURCES/runc-5d93f81.tar.gz +4e461ae6af04ffb599aea483968df8ec298b258e SOURCES/runc-e800860.tar.gz diff --git a/SPECS/runc.spec b/SPECS/runc.spec index 3590a95..9969369 100644 --- a/SPECS/runc.spec +++ b/SPECS/runc.spec @@ -25,22 +25,22 @@ # https://github.com/opencontainers/runc %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 5d93f81bdbc79a7bf052f8724caa5f0da36c33e4 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global git0 https://github.com/projectatomic/runc +%global commit0 e8008604cb0a1921ab416302265ed50d504696f5 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: %{repo} %if 0%{?fedora} Epoch: 1 %endif Version: 1.0.0 -Release: 3.rc2%{?dist} +Release: 6.git%{shortcommit0}%{?dist} Summary: CLI for running Open Containers License: ASL 2.0 URL: https://%{provider_prefix} -Source0: https://github.com/projectatomic/%{name}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Requires: criu -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} >= 1.6.2 BuildRequires: git @@ -155,20 +155,20 @@ providing packages with %{import_path} prefix. %endif %prep -%autosetup -Sgit -n %{repo}-%{commit} +%autosetup -Sgit -n %{name}-%{commit0} %build -mkdir -p src/github.com/opencontainers -ln -s ../../../ src/github.com/opencontainers/runc - -%if ! 0%{?with_bundled} -export GOPATH=$(pwd):%{gopath} -%else -export GOPATH=$(pwd):$(pwd)/Godeps/_workspace:%{gopath} -%endif +mkdir -p GOPATH +pushd GOPATH + mkdir -p src/%{provider}.%{provider_tld}/%{project} + ln -s $(dirs +1 -l) src/%{import_path} +popd +pushd GOPATH/src/%{import_path} +export GOPATH=%{gopath}:$(pwd)/GOPATH sed -i 's/seccomp/selinux seccomp/' Makefile make all +popd pushd man ./md2man-all.sh @@ -271,6 +271,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %endif %changelog +* Wed Apr 05 2017 Lokesh Mandvekar - 1.0.0-6.gite800860 +- Resolves: #1438911 - change default --root to /run/runc-ctrs + +* Tue Mar 21 2017 Lokesh Mandvekar - 1.0.0-5.git75f8da7 +- built @mrunalp/1_rc3 commit 75f8da7 + +* Thu Mar 16 2017 Lokesh Mandvekar - 1.0.0-4.gitee992e5 +- built @projectatomic/master commit ee992e5 + * Fri Feb 24 2017 Lokesh Mandvekar - 1.0.0-3.rc2 - Resolves: #1426674 - built projectatomic/runc_rhel_7 commit 5d93f81