From c675fac864b97007d1d07aca940e51d2587ea2201f055805e1fe392a57672c69 Mon Sep 17 00:00:00 2001
From: Jordi Massaguer <jmassaguerpla@suse.com>
Date: Tue, 1 Mar 2016 15:43:51 +0000
Subject: [PATCH] update to docker-1.10.2

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=74
---
 _service             |  4 ++--
 docker-1.10.1.tar.xz |  3 ---
 docker-1.10.2.tar.xz |  3 +++
 docker.changes       | 31 +++++++++++++++++++++++++++++++
 docker.spec          |  5 +++--
 5 files changed, 39 insertions(+), 7 deletions(-)
 delete mode 100644 docker-1.10.1.tar.xz
 create mode 100644 docker-1.10.2.tar.xz

diff --git a/_service b/_service
index d5e2138..582909f 100644
--- a/_service
+++ b/_service
@@ -3,8 +3,8 @@
     <param name="url">https://github.com/docker/docker.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">1.10.1</param>
-    <param name="revision">v1.10.1</param>
+    <param name="versionformat">1.10.2</param>
+    <param name="revision">v1.10.2</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">docker-*.tar</param>
diff --git a/docker-1.10.1.tar.xz b/docker-1.10.1.tar.xz
deleted file mode 100644
index 4fd1857..0000000
--- a/docker-1.10.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da8b04d5596ef138d19303bb4155dee423d88cb8977259c01d3d9b73ecc08e71
-size 8302256
diff --git a/docker-1.10.2.tar.xz b/docker-1.10.2.tar.xz
new file mode 100644
index 0000000..178de1e
--- /dev/null
+++ b/docker-1.10.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14bf1e45e2f8d75b70f6a6c734514fbcdf61308e0934aca7935d7d8eb0bbe5bb
+size 8306348
diff --git a/docker.changes b/docker.changes
index 94f486b..f1cc092 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Tue Feb 23 08:52:17 UTC 2016 - jmassaguerpla@suse.com
+
+Update to version 1.10.2
+
+  - Runtime
+    Prevent systemd from deleting containers' cgroups when its configuration is reloaded #20518
+    Fix SELinux issues by disregarding --read-only when mounting /dev/mqueue #20333
+    Fix chown permissions used during docker cp when userns is used #20446
+    Fix configuration loading issue with all booleans defaulting to true #20471
+    Fix occasional panic with docker logs -f #20522
+
+  - Distribution
+    Keep layer reference if deletion failed to avoid a badly inconsistent state #20513
+    Handle gracefully a corner case when canceling migration #20372
+    Fix docker import on compressed data #20367
+    Fix tar-split files corruption during migration that later cause docker push and docker save to fail #20458
+
+  - Networking
+    Fix daemon crash if embedded DNS is sent garbage #20510
+
+  - Volumes
+    Fix issue with multiple volume references with same name #20381
+
+  - Security
+    Fix potential cache corruption and delegation conflict issues #20523
+ 
+link to changelog:
+
+https://github.com/docker/docker/blob/v1.10.2/CHANGELOG.md
+
 -------------------------------------------------------------------
 Mon Feb 15 12:13:16 UTC 2016 - asarai@suse.com
 
diff --git a/docker.spec b/docker.spec
index c9d1100..2112fe7 100644
--- a/docker.spec
+++ b/docker.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package docker
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %define git_version 9e83765
 %define go_arches %ix86 x86_64
 Name:           docker
-Version:        1.10.1
+Version:        1.10.2
 Release:        0
 Summary:        The Linux container runtime
 License:        Apache-2.0
@@ -73,6 +73,7 @@ BuildRequires:  zsh
 Requires:       apparmor-parser
 Requires:       bridge-utils
 Requires:       ca-certificates-mozilla
+Requires:       docker-image-migrator
 # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used
 Requires:       e2fsprogs
 Requires:       git-core >= 1.7