From 1e5d8396835e07363993da45f521738f48cb1116 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Aug 17 2017 20:38:07 +0000
Subject: oci-umount >= 2:2.0.0-1 is an independent package


Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

---

diff --git a/docker.spec b/docker.spec
index ae708f5..ff7ed80 100644
--- a/docker.spec
+++ b/docker.spec
@@ -86,11 +86,6 @@
 %global commit_tini 4892d4dc7add670cede5640bd37a29ed0547e030
 %global shortcommit_tini %(c=%{commit_tini}; echo ${c:0:7})
 
-#oci-umount
-%global git_umount https://github.com/projectatomic/oci-umount
-%global commit_umount 299e781918c053d72b3d5fed8c6c149366d20ab0
-%global shortcommit_umount %(c=%{commit_umount}; echo ${c:0:7})
-
 Name: %{repo}
 %if 0%{?fedora} || 0%{?centos}
 Epoch: 2
@@ -125,7 +120,6 @@ Source20: %{repo}.service.centos
 Source21: %{repo}-containerd.service.centos
 Source22: %{git_libnetwork}/archive/%{commit_libnetwork}/libnetwork-%{shortcommit_libnetwork}.tar.gz
 Source23: %{git_tini}/archive/%{commit_tini}/tini-%{shortcommit_tini}.tar.gz
-Source24: %{git_umount}/archive/%{commit_umount}/oci-umount-%{shortcommit_umount}.tar.gz
 Source25: seccomp.json
 
 %if 0%{?with_debug}
@@ -217,7 +211,7 @@ Requires: criu
 %endif
 
 #oci-umount should probably be a hard dependency, not soft
-Requires: oci-umount
+Requires: oci-umount >= 2:2.0.0-1
 
 %if %{custom_storage}
 Provides: variant_config(Atomic.host)
@@ -598,10 +592,6 @@ tar zxf %{SOURCE22}
 # untar tini
 tar zxf %{SOURCE23}
 
-# untar oci-hook
-tar zxf %{SOURCE24}
-
-
 %build
 # set up temporary build gopath, and put our directory there
 mkdir _build
@@ -677,14 +667,6 @@ cmake .
 make tini-static
 popd
 
-# build oci-umount
-pushd oci-umount-%{commit_umount}
-autoreconf -i
-%configure --libexecdir=/usr/libexec/oci/hooks.d/
-make %{?_smp_mflags}
-popd
-
-
 %install
 # install binary
 install -d %{buildroot}%{_bindir}
@@ -775,11 +757,6 @@ install -p -m 755 containerd-%{commit_containerd}/bin/ctr %{buildroot}%{_libexec
 install -d %{buildroot}%{_libexecdir}/%{repo}
 install -p -m 755 tini-%{commit_tini}/tini-static %{buildroot}%{_libexecdir}/%{repo}/%{repo}-init-current
 
-# install oci-umount
-pushd oci-umount-%{commit_umount}
-%make_install
-popd
-
 # for additional args
 install -d %{buildroot}%{_sysconfdir}/sysconfig/
 install -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/%{repo}
@@ -1053,15 +1030,6 @@ exit 0
 %{_libexecdir}/%{repo}/%{repo}-lvm-plugin
 %{_unitdir}/%{repo}-lvm-plugin.*
 
-%files -n oci-umount
-%{_libexecdir}/oci/hooks.d/oci-umount
-%{_mandir}/man1/oci-umount.1*
-%doc  oci-umount-%{commit_umount}/README.md
-%license  oci-umount-%{commit_umount}/LICENSE
-%dir %{_libexecdir}/oci
-%dir %{_libexecdir}/oci/hooks.d
-%config(noreplace) %{_sysconfdir}/oci-umount.conf
-
 %changelog
 * Wed Aug 16 2017 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1.13.1-22.gitb5e3294
 - built docker @projectatomic/docker-1.13.1 commit b5e3294