[docker-io/f19] update to v1.4.0

[Lokesh Mandvekar]

commit 610290263a4b15af2f5220e961befc88b37b2500
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org&gt;
Date:   Fri Dec 12 07:38:54 2014 +0000

    update to v1.4.0
    
    NVR: docker-io-1.4.0-1
    
    - Resolves: rhbz#1173324
    - Resolves: rhbz#1172761 - CVE-2014-9356
    - Resolves: rhbz#1172782 - CVE-2014-9357
    - Resolves: rhbz#1172787 - CVE-2014-9358
    - update to upstream v1.4.0
    - override DOCKER_CERT_PATH in sysconfig instead of patching the source
    - update metaprovides
    
    Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org&gt;

 docker-io.spec   |    3 ++-
 docker.sysconfig |    8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 300789d..8142213 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -193,7 +193,7 @@ mkdir -p ./_build/src/github.com/docker
 ln -s $(pwd) ./_build/src/%{import_path}
 
 export DOCKER_GITCOMMIT="%{shortcommit}/%{version}"
-#export DOCKER_BUILDTAGS='selinux'
+export DOCKER_BUILDTAGS='btrfs_noversion'
 export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath}
 
 hack/make.sh dynbinary
@@ -312,6 +312,7 @@ exit 0
 - update to upstream v1.4.0
 - override DOCKER_CERT_PATH in sysconfig instead of patching the source
 - update metaprovides
+- disable btrfs version check
 
 * Tue Nov 25 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org&gt; - 1.3.2-2
 - install sources skipped prior
diff --git a/docker.sysconfig b/docker.sysconfig
index c8c301a..a63b304 100644
--- a/docker.sysconfig
+++ b/docker.sysconfig
@@ -1 +1,7 @@
-OPTIONS=--selinux-enabled
+OPTIONS=
+DOCKER_CERT_PATH=/etc/docker
+
+# Location used for temporary files, such as those created by
+# docker load and build operations. Default is /var/lib/docker/tmp
+# Can be overriden by setting the following environment variable.
+# DOCKER_TMPDIR=/var/tmp