From b3b0f15fd92a8dad8fabf0771798dea3da3f617a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 29 2019 16:00:26 +0000 Subject: import oci-umount-2.5-1.el7_6 --- diff --git a/.gitignore b/.gitignore index 9d4eba8..3b12467 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/oci-umount-87f9237.tar.gz +SOURCES/oci-umount-2da5d7f.tar.gz diff --git a/.oci-umount.metadata b/.oci-umount.metadata index 8f760c7..46c0313 100644 --- a/.oci-umount.metadata +++ b/.oci-umount.metadata @@ -1 +1 @@ -88e0ecab3301cd70b9b72a26350867d275e0ffe0 SOURCES/oci-umount-87f9237.tar.gz +40fee2bcfa4974cf3050fd136e53d2f1a6102597 SOURCES/oci-umount-2da5d7f.tar.gz diff --git a/SPECS/oci-umount.spec b/SPECS/oci-umount.spec index d1c2736..6168779 100644 --- a/SPECS/oci-umount.spec +++ b/SPECS/oci-umount.spec @@ -1,17 +1,17 @@ %global provider github %global provider_tld com -%global project projectatomic +%global project containers %global repo oci-umount # https://github.com/projectatomic/oci-umount %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 87f9237e1de6e0bb6aedec9165db0ffe214df004 +%global commit 2da5d7fc654981600f93ea5c70d0a1091a19c8e4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -Name: oci-umount +Name: %{repo} Epoch: 2 -Version: 2.3.4 -Release: 2.git%{shortcommit}%{?dist} +Version: 2.5 +Release: 1%{?dist} Summary: OCI umount hook for docker Group: Applications/Text License: GPLv3+ @@ -27,7 +27,6 @@ BuildRequires: git BuildRequires: autoconf BuildRequires: automake BuildRequires: pkgconfig(yajl) -BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(mount) BuildRequires: golang-github-cpuguy83-go-md2man BuildRequires: pcre-devel @@ -61,10 +60,17 @@ install -d %{buildroot}%{_datadir}/%{name}/%{name}.d %dir %{_datadir}/%{name}/%{name}.d %{_datadir}/%{name}/oci-umount-options.conf %{_datadir}/containers/oci/hooks.d/%{name}.json +%{_mandir}/man5/%{name}*.5.gz %ghost %{_sysconfdir}/%{name}/%{name}.d %ghost /etc/oci-umount/oci-umount-options.conf %changelog +* Fri Jun 07 2019 Lokesh Mandvekar - 2:2.5-1 +- Resolves: #1717917 - bump to v2.5 + +* Tue Nov 06 2018 Frantisek Kluknavsky - 2:2.3.4-3.git87f9237 +- drop selinux dependency + * Tue Nov 06 2018 Frantisek Kluknavsky - 2:2.3.4-2.git87f9237 - rebase