From ce8ddde002032d5dbdee1f19b8e40c19f030feeb Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Aug 23 2016 12:42:56 +0000 Subject: NVR: docker-2:1.12.1-3.git8ea583f - use our forked projectatomic/runc instead of upstream Signed-off-by: Antonio Murdaca --- diff --git a/.gitignore b/.gitignore index aaeeadb..42cefeb 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /docker-selinux-bcd6528.tar.gz /runc-cc29e3d.tar.gz /docker-8ea583f.tar.gz +/runc-ee10b44.tar.gz diff --git a/docker.spec b/docker.spec index ea369e5..bf0ea16 100644 --- a/docker.spec +++ b/docker.spec @@ -59,8 +59,8 @@ %global shortcommit5 %(c=%{commit5}; echo ${c:0:7}) # docker-runc -%global git6 https://github.com/opencontainers/runc/ -%global commit6 cc29e3dded8e27ba8f65738f40d251c885030a28 +%global git6 https://github.com/projectatomic/runc/ +%global commit6 ee10b449a5ea0a24586a86962fc540e9e94258c9 %global shortcommit6 %(c=%{commit6}; echo ${c:0:7}) # docker-containerd @@ -94,7 +94,7 @@ Name: %{repo} Epoch: 2 %endif Version: 1.12.1 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} @@ -825,6 +825,9 @@ exit 0 %{_datadir}/rhel/secrets/rhsm %changelog +* Tue Aug 23 2016 Antonio Murdaca - 2:1.12.1-3.git8ea583f +- use our forked projectatomic/runc instead of upstream + * Mon Aug 22 2016 Antonio Murdaca - 2:1.12.1-2.git8ea583f - Bump to 1.12.1 - Fix BZ#1311750 diff --git a/sources b/sources index 8b94ec9..c47181e 100644 --- a/sources +++ b/sources @@ -3,5 +3,5 @@ f0a0c1101ad259b84fb457c8c7036723 containerd-0ac3cd1.tar.gz e237e3422b74ab7d98364cc753597377 docker-novolume-plugin-7715854.tar.gz 9b94d69d40e7f79e713b1263e90e8efa docker-selinux-bcd6528.tar.gz feefc81a3ced4cbf48218b75f2d48bf1 docker-storage-setup-194eca2.tar.gz -716d0b284ce42490eeb83befba10fafb runc-cc29e3d.tar.gz +321c39d69d4a59604f07f1b0e314b3c2 runc-ee10b44.tar.gz 1f7d112be5ba2380804762d965f9954d v1.10-migrator-994c35c.tar.gz