[docker-io: 12/14] merged official git into github-master

[Lokesh Mandvekar]

commit 3267bf518f060515511d665193ee773d4cd2fe15
Merge: f2e61f5 38aab8d
Author: Lokesh Mandvekar <lsm5 at redhat.com>
Date:   Wed Nov 27 16:02:03 2013 -0600

    merged official git into github-master
    
    Signed-off-by: Lokesh Mandvekar <lsm5 at redhat.com>

 .gitignore              |    1 +
 docker-io.spec          |   37 ++++++++++++++++++++++++++++++++-----
 docker-rhel-brctl.patch |   21 +++++++++++++++++++++
 sources                 |    1 +
 4 files changed, 55 insertions(+), 5 deletions(-)
---
diff --cc docker-io.spec
index 48a9670,a82b023..1ef50c0
--- a/docker-io.spec
+++ b/docker-io.spec
@@@ -46,8 -48,18 +48,16 @@@ Requires(postun):   initscript
  %endif
  Requires:       lxc
  Requires:       tar
 -
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1035436
+ # this won't be needed for rhel7+
+ %if 0%{?rhel} <= 7
+ Requires:       bridge-utils
+ %endif
 -
 -Provides:       lxc-docker = %{version}
 -
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1034919
+ Requires:       libcgroup
+ 
 +Provides:       lxc-docker = %{version}
 +
  %description
  Docker is an open-source engine that automates the deployment of any
  application as a lightweight, portable, self-sufficient container that will