From 9cab9ce29a417c8b9a47fc6b0ca10fcef474b43a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 28 Jul 2020 06:10:26 -0400
Subject: [PATCH] import
 containernetworking-plugins-0.8.6-1.module+el8.3.0+7084+c16098dd

---
 .containernetworking-plugins.metadata  |  2 +-
 .gitignore                             |  2 +-
 SPECS/containernetworking-plugins.spec | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.containernetworking-plugins.metadata b/.containernetworking-plugins.metadata
index 6b9039c..c4e3f51 100644
--- a/.containernetworking-plugins.metadata
+++ b/.containernetworking-plugins.metadata
@@ -1 +1 @@
-78fc72f4a51634078171068805db4e4b245c6af9 SOURCES/plugins-d5efdfe.tar.gz
+90e6339a94b210443a08a3f6ded99e7913cf6a78 SOURCES/v0.8.6.tar.gz
diff --git a/.gitignore b/.gitignore
index 84edb48..88af467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/plugins-d5efdfe.tar.gz
+SOURCES/v0.8.6.tar.gz
diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec
index 91e14b2..610c5e3 100644
--- a/SPECS/containernetworking-plugins.spec
+++ b/SPECS/containernetworking-plugins.spec
@@ -21,16 +21,14 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL
 # https://github.com/containernetworking/plugins
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
-%global commit d5efdfe1f6d6e8e9e9494e3f43be54f76c0f8fd6
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name: containernetworking-plugins
-Version: 0.8.3
-Release: 5%{?dist}
+Version: 0.8.6
+Release: 1%{?dist}
 Summary: CNI network plugins
 License: ASL 2.0
 URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
+Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz
 ExcludeArch: ppc64 i686
 BuildRequires: golang >= 1.12.12-4
 BuildRequires: git
@@ -45,7 +43,7 @@ only with network connectivity of containers and removing allocated resources
 when the container is deleted.
 
 %prep
-%autosetup -n %{repo}-%{commit} -p1
+%autosetup -Sgit -n %{repo}-%{version}
 rm -rf plugins/main/windows
 
 %build
@@ -121,6 +119,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_libexecdir}/cni/*
 
 %changelog
+* Thu May 14 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.6-1
+- update to https://github.com/containernetworking/plugins/releases/tag/v0.8.6
+- Related: #1821193
+
+* Tue May 12 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.5-1
+- synchronize containter-tools 8.3.0 with 8.2.1
+- Related: #1821193
+
 * Thu Dec 12 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-5
 - compile with no_openssl
 - Related: RHELPLAN-25139