From 4c8188c6412bfd8ebde68ddcdabb4424d18c6c35 Mon Sep 17 00:00:00 2001
From: Frantisek Kluknavsky <fkluknav@redhat.com>
Date: May 28 2017 14:14:07 +0000
Subject: rebase to latest upstream

docker-oci-umount renamed to oci-umount
docker depends on oci-umount, not vice-versa

---

diff --git a/.gitignore b/.gitignore
index 3dcb87e..a45f8c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,3 +126,4 @@
 /docker-14cc629.tar.gz
 /containerd-03e5862.tar.gz
 /oci-umount-7623f6a.tar.gz
+/docker-51eb16e.tar.gz
diff --git a/docker.spec b/docker.spec
index 137b725..0b1a73f 100644
--- a/docker.spec
+++ b/docker.spec
@@ -39,7 +39,7 @@
 
 # docker
 %global git_docker https://github.com/runcom/docker
-%global commit_docker 14cc629fbd6c4bac205e675134d0e8235633e6a3
+%global commit_docker 51eb16eb1622a03a7a3c3394f6b8f71549be8bf9
 %global shortcommit_docker %(c=%{commit_docker}; echo ${c:0:7})
 # docker_branch used in %%check
 %global docker_branch docker-1.13.1
@@ -102,7 +102,7 @@ Name: %{repo}
 Epoch: 2
 %endif
 Version: 1.13.1
-Release: 12.git%{shortcommit_docker}%{?dist}
+Release: 13.git%{shortcommit_docker}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo}
@@ -233,6 +233,8 @@ Requires: oci-systemd-hook
 Requires: criu
 %endif
 
+#oci-umount should probably be a hard dependency, not soft
+Requires: oci-umount
 
 %if %{custom_storage}
 Provides: variant_config(Atomic.host)
@@ -539,12 +541,12 @@ Docker Volume Driver for lvm volumes.
 This plugin can be used to create lvm volumes of specified size, which can
 then be bind mounted into the container using `docker run` command.
 
-%package oci-umount
+%package -n oci-umount
 License: GPLv3+
 Summary: OCI umount hook for docker
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: docker-oci-umount < 1.13.1-13
 
-%description oci-umount
+%description -n oci-umount
 OCI umount hooks unmount potential leaked mount points in a containers
 mount namespaces.
 
@@ -1074,7 +1076,7 @@ exit 0
 %{_libexecdir}/%{repo}/%{repo}-lvm-plugin
 %{_unitdir}/%{repo}-lvm-plugin.*
 
-%files oci-umount
+%files -n oci-umount
 %{_libexecdir}/oci/hooks.d/oci-umount
 %{_mandir}/man1/oci-umount.1*
 %doc  oci-umount-%{commit_umount}/README.md
@@ -1084,6 +1086,11 @@ exit 0
 %config(noreplace) %{_sysconfdir}/oci-umount.conf
 
 %changelog
+* Sun May 28 2017 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.13.1-13.git51eb16e
+- rebase to latest upstream
+- docker-oci-umount renamed to oci-umount
+- docker depends on oci-umount, not vice-versa
+
 * Fri May 26 2017 Frantisek Kluknavsky <fkluknav@redhat.com> - 2:1.13.1-12.git14cc629
 - mark /etc/oci-umount.conf as config(noreplace)
 
diff --git a/sources b/sources
index d2a330a..3790927 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,5 @@
 SHA512 (container-storage-setup-1c1cb90.tar.gz) = b464bc8b2740787ec882f59d4921ad32aeeb3d417ab6273c745342b71a157c85dce934a770533fe5965a4301ccaf656c81b94142f84704afd9e6c86e1871e69d
 SHA512 (containerd-03e5862.tar.gz) = 7c320a8f8fc12ae74ccda00d0f2f45f66d7592b5d209a62553cff3463a6006d8ad0275e0ae4ef07879455a32767f1d33f8f0f34392d28be4e6c217eee0f36ca3
-SHA512 (docker-14cc629.tar.gz) = b843a13ba352e2788587ac9cd9813355da2c6b1fda110d163bf55f50cd74ceb169f950be9c690f343bb8a172095cec66c3861cea95f514e522901b4817c2bc3c
 SHA512 (docker-lvm-plugin-bc03b53.tar.gz) = f619ec62ff7b536256aec70e0a6ecf42b2172b48fde60affc4cccd20801fc9364bb50fbcb6c23bfbc33cfae285b26a5fd11dbe15768ea5a9245e85197a48d407
 SHA512 (docker-novolume-plugin-c521254.tar.gz) = 54ba6c541597fedbd64db742d431f679306e82f42fb7d84c6cef4b1066b763ca21b9ff7b79613fc8f9ec025b8d5fb90e06464104c35e604e05d9be35a518110c
 SHA512 (libnetwork-0f53435.tar.gz) = 754cf6489968f3a83392c52b9445f71e8d5faca96e23ffc3ee2c6e8644bf065b64c7497395cf8fac9cc083ce9c7668260e319d01a8f10613e67db2d8254f6b06
@@ -8,3 +7,4 @@ SHA512 (rhel-push-plugin-70653ed.tar.gz) = 1559b4b98a715087bd9ec88f15dd532ca93e4
 SHA512 (runc-e18c2ce.tar.gz) = 639039098251dbbf2286821a1858a56fca4bae840cf3094b00edaa771aa0ae503b88fed28aa13ae52f316b7069b07364ebbffe1ff108a46bc93e24a4eaff2c8b
 SHA512 (tini-949e6fa.tar.gz) = b6c1454f734662adf2fdedcb75cb7cdc82f4cf5b4c41fadf6891a670fa26d49b789034f4af8bf920b9e1ff1c3536123637ade9471f4ae2c1ef6c534e839b9f27
 SHA512 (oci-umount-7623f6a.tar.gz) = cbd3a4ec59377dd3d7d4422cba1ac53a4497ac530cb004a0b6cb0aea13ce2d5c98c8f0a0187f35d6ac26cfb6c907537d37ba19cfea2a5cd21d1fb6ff67cb3938
+SHA512 (docker-51eb16e.tar.gz) = 3c63df90ceb8a59ced4a1a81692cac846154c25c664ed474e3fa1c75ac9caeb478b0266d7278e02ec02217d76b149268d836ddf2b7a882ba99d3fff1d0c01062