From 3c9b4832ad7ab334d4ab5ac148ba7bcee4cbe6f6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 29 2019 16:18:29 +0000
Subject: import containernetworking-plugins-0.8.1-1.el7


---

diff --git a/.containernetworking-plugins.metadata b/.containernetworking-plugins.metadata
index a5475f3..049b7c4 100644
--- a/.containernetworking-plugins.metadata
+++ b/.containernetworking-plugins.metadata
@@ -1 +1 @@
-df9ad0e982330c5199849eb59fe069c4f402dcba SOURCES/plugins-a62711a.tar.gz
+b574080f86ef426a169014f5fc6008b280514de0 SOURCES/plugins-fe60fcd.tar.gz
diff --git a/.gitignore b/.gitignore
index 00fb5d9..9848234 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/plugins-a62711a.tar.gz
+SOURCES/plugins-fe60fcd.tar.gz
diff --git a/SPECS/containernetworking-plugins.spec b/SPECS/containernetworking-plugins.spec
index 378fc43..f2e17d8 100644
--- a/SPECS/containernetworking-plugins.spec
+++ b/SPECS/containernetworking-plugins.spec
@@ -18,19 +18,19 @@
 # https://github.com/containernetworking/plugins
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          a62711a5da7a2dc2eb93eac47e103738ad923fd6
+%global commit          fe60fcddb897079746ec1523fd1837ab05b1e689
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
-Name:           containernetworking-plugins
-Version:        0.7.5
-Release:        2%{?dist}
-Summary:        Some CNI network plugins, maintained by the containernetworking team.
-License:        ASL 2.0
-URL:            https://%{provider_prefix}
-Source0:        https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-ExclusiveArch:  aarch64 %{arm} ppc64le s390x x86_64 %{ix86}
+Name: containernetworking-plugins
+Version: 0.8.1
+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
+ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
 
-%if 0%{?fedora} 
+%if 0%{?fedora} || 0%{?centos}
 BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 %else
 BuildRequires: go-toolset-1.10
@@ -50,6 +50,7 @@ when the container is deleted.
 
 %prep
 %autosetup -Sgit -n %{repo}-%{commit}
+rm -rf plugins/main/windows
 
 %build
 export ORG_PATH="%{provider}.%{provider_tld}/%{project}"
@@ -66,11 +67,11 @@ mkdir -p $(pwd)/bin
 echo "Building plugins"
 export PLUGINS="plugins/meta/* plugins/main/* plugins/ipam/* plugins/sample"
 for d in $PLUGINS; do
-   if [ -d "$d" ]; then
-      plugin="$(basename "$d")"
-      echo "  $plugin"
-      %gobuild -o "${PWD}/bin/$plugin" "$@" "$REPO_PATH"/$d
-   fi
+        if [ -d "$d" ]; then
+                plugin="$(basename "$d")"
+                echo "  $plugin"
+                %gobuild -o "${PWD}/bin/$plugin" "$@" "$REPO_PATH"/$d
+        fi
 done
 
 %install
@@ -120,8 +121,11 @@ install -p -m 0755 bin/* %{buildroot}/%{_libexecdir}/cni
 %{_libexecdir}/cni/*
 
 %changelog
-* Wed May 01 2019 Johnny Hughes <johnny@centos.org>
-- Build with go-toolset, build on i386
+* Fri Jun 07 2019 Lokesh Mandvekar <lsm5@redhat.com> - 0.8.1-1
+- Resolves: #1717915 - bump to v0.8.1
+
+* Tue May 14 2019 Lokesh Mandvekar <lsm5@redhat.com> - 0.8.0-1
+- Resolves: #1709630 - rebase to v0.8.0
 
 * Wed Mar 27 2019 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.7.5-2
 - rebase