From 2bc802d474b0f085ae08273e234472ab08a4e4c1d09a2e4872a6c521f1d5e10b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Thu, 22 Jan 2015 20:49:38 +0000
Subject: [PATCH] Accepting request 282380 from Virtualization

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/282380
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=12
---
 docker-1.4.0.tar.bz2 |  3 ---
 docker-1.4.1.tar.bz2 |  3 +++
 docker.changes       | 16 ++++++++++++++++
 docker.socket        |  8 ++++++--
 docker.spec          |  8 +++++---
 5 files changed, 30 insertions(+), 8 deletions(-)
 delete mode 100644 docker-1.4.0.tar.bz2
 create mode 100644 docker-1.4.1.tar.bz2

diff --git a/docker-1.4.0.tar.bz2 b/docker-1.4.0.tar.bz2
deleted file mode 100644
index 35d4a82..0000000
--- a/docker-1.4.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8c776324a096c6eeb450fb79346d9fd4e136dd07601f7e7e2bc0fe150a428e49
-size 5834548
diff --git a/docker-1.4.1.tar.bz2 b/docker-1.4.1.tar.bz2
new file mode 100644
index 0000000..6634da9
--- /dev/null
+++ b/docker-1.4.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b9852cbabf81bae75acc141801a9aa5db2839e21b9900b7b79ba5905e1b620d3
+size 5837275
diff --git a/docker.changes b/docker.changes
index 00cf5c8..01428e9 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Jan 15 10:00:07 UTC 2015 - fcastelli@suse.com
+
+- Updated to 1.4.1 (2014-12-15):
+  * Runtime:
+    - Fix issue with volumes-from and bind mounts not being honored after
+      create (fixes bnc#913213)
+
+-------------------------------------------------------------------
+Thu Jan 15 09:41:20 UTC 2015 - fcastelli@suse.com
+
+- Added e2fsprogs as runtime dependency, this is required when the
+  devicemapper driver is used. (bnc#913211).
+- Fixed owner & group for docker.socket (thanks to Andrei Dziahel and
+  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752555#5)
+
 -------------------------------------------------------------------
 Fri Dec 12 16:13:30 UTC 2014 - fcastelli@suse.com
 
diff --git a/docker.socket b/docker.socket
index b4b521d..7d23ab3 100644
--- a/docker.socket
+++ b/docker.socket
@@ -4,8 +4,12 @@ Description=Docker Socket for the API
 [Socket]
 ListenStream=/var/run/docker.sock
 SocketMode=0660
-SocketUser=root
-SocketGroup=docker
+# TODO: Get rid of workaround below after adopting systemd 214+ by oS Factory
+# Socket(User|Group) are available as of systemd 214+
+#SocketUser=root
+#SocketGroup=docker
+# Fix owner manually
+ExecStartPost=/usr/bin/chown root:docker /var/run/docker.sock
 
 [Install]
 WantedBy=sockets.target
diff --git a/docker.spec b/docker.spec
index 65881ef..0cf31b9 100644
--- a/docker.spec
+++ b/docker.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package docker
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,9 @@
 #
 
 
-%define git_version 4595d4f
+%define git_version 5bc2ff8
 Name:           docker
-Version:        1.4.0
+Version:        1.4.1
 Release:        0
 Summary:        The Linux container runtime
 License:        Apache-2.0
@@ -47,6 +47,8 @@ BuildRequires:  zsh
 Requires:       apparmor-parser
 Requires:       bridge-utils
 Requires:       ca-certificates-mozilla
+# Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used
+Requires:       e2fsprogs
 Requires:       git-core >= 1.7
 Requires:       iproute2 >= 3.5
 Requires:       iptables >= 1.4