From f693dd29819a353f6c67078c3b5235e43123f566b33a0c98ea12ddb64cb01ab4 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 9 Sep 2020 15:49:30 +0000
Subject: [PATCH] Accepting request 832782 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/832782
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cni-plugins?expand=0&rev=13
---
 _service                 |  4 ++--
 _servicedata             |  4 ++++
 cni-plugins-0.8.6.tar.xz |  3 ---
 cni-plugins-0.8.7.tar.xz |  3 +++
 cni-plugins.changes      | 14 ++++++++++++++
 cni-plugins.spec         |  7 +------
 6 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 _servicedata
 delete mode 100644 cni-plugins-0.8.6.tar.xz
 create mode 100644 cni-plugins-0.8.7.tar.xz

diff --git a/_service b/_service
index 3c98249..4bb072e 100644
--- a/_service
+++ b/_service
@@ -4,8 +4,8 @@
     <param name="scm">git</param>
     <param name="filename">cni-plugins</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">0.8.6</param>
-    <param name="revision">v0.8.6</param>
+    <param name="versionformat">0.8.7</param>
+    <param name="revision">v0.8.7</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..b2b95ce
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://github.com/containernetworking/plugins.git</param>
+              <param name="changesrevision">9b8de6a613657df14a3a5958642872fa9855d570</param></service></servicedata>
\ No newline at end of file
diff --git a/cni-plugins-0.8.6.tar.xz b/cni-plugins-0.8.6.tar.xz
deleted file mode 100644
index 1223a44..0000000
--- a/cni-plugins-0.8.6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7013ab0a4aa59f7bed850ada939f834f8212571b7747fb1d5b5fe1f13dc5aafc
-size 789800
diff --git a/cni-plugins-0.8.7.tar.xz b/cni-plugins-0.8.7.tar.xz
new file mode 100644
index 0000000..9b5f1d3
--- /dev/null
+++ b/cni-plugins-0.8.7.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:edd2ee2973538bf6561b7e2b3157382c5e18e760e0d4ea393be2f1dad5f0f7db
+size 770196
diff --git a/cni-plugins.changes b/cni-plugins.changes
index 8021d77..9829416 100644
--- a/cni-plugins.changes
+++ b/cni-plugins.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Aug 31 09:15:35 UTC 2020 - dmueller@suse.com
+
+- Update to version 0.8.7:
+  * Fix race condition in GetCurrentNS
+  * lo: CNI_IFNAME is no longer ignored
+  * cni: bump to 0.8.0
+  * Bump Go version to 1.13 and 1.14
+  * Add contact info
+  * Update firewall README.md CNI-ADMIN
+  * firewall: fix some typos in docs
+  * portmap DEL noop if no portMappings present
+  * flannel: remove net conf file after DEL succeed
+
 -------------------------------------------------------------------
 Wed Jun 17 08:38:27 UTC 2020 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 
diff --git a/cni-plugins.spec b/cni-plugins.spec
index 82115ee..5a0e15b 100644
--- a/cni-plugins.spec
+++ b/cni-plugins.spec
@@ -18,17 +18,14 @@
 
 %define         cni_bin_dir  %{_libexecdir}/cni
 %define         cni_doc_dir  %{_docdir}/cni-plugins
-
 Name:           cni-plugins
-Version:        0.8.6
+Version:        0.8.7
 Release:        0
 Summary:        Container Network Interface plugins
 License:        Apache-2.0
 Group:          System/Management
 URL:            https://github.com/containernetworking/plugins
 Source:         %{name}-%{version}.tar.xz
-BuildRequires:  go >= 1.11
-BuildRequires:  golang-packaging
 BuildRequires:  golang-packaging
 BuildRequires:  shadow
 BuildRequires:  systemd-rpm-macros
@@ -36,7 +33,6 @@ BuildRequires:  xz
 BuildRequires:  golang(API) >= 1.11
 Requires:       cni
 Requires(post): %fillup_prereq
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 # Make sure that the binary is not getting stripped.
 %{go_nostrip}
@@ -77,7 +73,6 @@ install -m 755 -d "%{buildroot}%{cni_doc_dir}"
 %{fillup_only -n %{name}}
 
 %files
-%defattr(-,root,root)
 %dir %{cni_doc_dir}
 %doc CONTRIBUTING.md
 %doc README.md