[docker-io/el6] fix capabilities for el6

Lokesh Mandvekar lsm5 at fedoraproject.org
Wed May 14 18:21:51 UTC 2014


commit ea1e21cb6319be342b459ee7be439b573f0fd66e
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Wed May 14 14:21:39 2014 -0400

    fix capabilities for el6

 docker-io.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 74cacb6..d7c41d2 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,12 +10,13 @@
 
 Name:           docker-io
 Version:        0.11.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Automates deployment of containerized applications
 License:        ASL 2.0
 
 Patch0:         ignore-btrfs-for-rhel.patch
 Patch1:         upstream-patched-archive-tar.patch
+Patch2:         el6-capabilities.patch
 Patch90:        docker-0.9-el6-lxc.patch
 
 URL:            http://www.docker.io
@@ -72,7 +73,8 @@ rm -rf vendor
 %patch0 -p1 -b ignore-btrfs-for-rhel
 %patch90 -p1 -b docker-0.9-el6-lxc
 %patch1 -p1 -F 2 -b upstream-patched-archive-tar
-cp -p %SOURCE1 contrib/init/sysvinit-redhat/docker.sysconfig
+%patch2 -p1 -b el6-capabilities
+cp -p %{SOURCE1} contrib/init/sysvinit-redhat/docker.sysconfig
 
 %build
 mkdir _build
@@ -166,6 +168,10 @@ fi
 %{_datadir}/vim/vimfiles/syntax/dockerfile.vim
 
 %changelog
+* Wed May 14 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0.11.1-4
+- el6 capabilities fix from Vincent Batts <vbatts at redhat.com>
+ https://github.com/vbatts/docker/commit/a8b720e191e149cb9abf4230c0c5fd410282400d
+
 * Tue May 13 2014 Stephen Price <steeef at gmail.com> - 0.11.1-3
 - add selinux to sysconfig
 


More information about the scm-commits mailing list