From ab1614315bd30c0e96e90fda0ed61de4de155341798a3dbabfdc24584aa055f9 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Thu, 24 Sep 2020 14:12:11 +0000
Subject: [PATCH] Accepting request 835753 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/835753
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/conmon?expand=0&rev=17
---
 _service             |  6 ++++--
 _servicedata         |  4 ++++
 conmon-2.0.20.tar.xz |  3 ---
 conmon-2.0.21.tar.xz |  3 +++
 conmon.changes       | 15 +++++++++++++++
 conmon.spec          |  2 +-
 6 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 _servicedata
 delete mode 100644 conmon-2.0.20.tar.xz
 create mode 100644 conmon-2.0.21.tar.xz

diff --git a/_service b/_service
index 976fd7a..d32cd1c 100644
--- a/_service
+++ b/_service
@@ -2,8 +2,10 @@
 <service name="tar_scm" mode="disabled">
 <param name="url">https://github.com/containers/conmon</param>
 <param name="scm">git</param>
-<param name="versionformat">2.0.20</param>
-<param name="revision">v2.0.20</param>
+<param name="versionformat">@PARENT_TAG@</param>
+<param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param>
+<param name="revision">v2.0.21</param>
+<param name="changesgenerate">enable</param>
 </service>
 <service name="recompress" mode="disabled">
 <param name="file">conmon-*.tar</param>
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..e11c259
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+                <param name="url">https://github.com/containers/conmon</param>
+              <param name="changesrevision">35a2fa83022e56e18af7e6a865ba5d7165fa2a4a</param></service></servicedata>
\ No newline at end of file
diff --git a/conmon-2.0.20.tar.xz b/conmon-2.0.20.tar.xz
deleted file mode 100644
index 0c3ddfc..0000000
--- a/conmon-2.0.20.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e8028468d5dd05f35f994970009db58ec18e861b2ccae1d2a882101de70d3d8e
-size 56284
diff --git a/conmon-2.0.21.tar.xz b/conmon-2.0.21.tar.xz
new file mode 100644
index 0000000..0acb2d4
--- /dev/null
+++ b/conmon-2.0.21.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb759021738748c3fa6466541e93d64e65c6a91aa84142828dad99891285c7a6
+size 49508
diff --git a/conmon.changes b/conmon.changes
index 9a21151..a0be3bb 100644
--- a/conmon.changes
+++ b/conmon.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Sep 21 07:06:04 UTC 2020 - dmueller@suse.com
+
+- Update to version 2.0.21:
+  * bump to v2.0.21
+  * protect against kill(-1)
+  * Makefile: enable debuginfo generation
+  * Remove go.sum file and add go.mod
+  * Fail if conmon config could not be written
+  * nix: remove double definition for e2fsprogs
+  * Speedup static build by utilizing CI cache on `/nix` folder
+  * Fix nix build for failing e2fsprogs tests
+  * test: fix CI
+  * Use Podman for building
+
 -------------------------------------------------------------------
 Wed Jul 29 10:20:58 UTC 2020 - Sascha Grunert <sgrunert@suse.com>
 
diff --git a/conmon.spec b/conmon.spec
index bbbb8c1..e608e8a 100644
--- a/conmon.spec
+++ b/conmon.spec
@@ -17,7 +17,7 @@
 
 
 Name:           conmon
-Version:        2.0.20
+Version:        2.0.21
 Release:        0
 Summary:        An OCI container runtime monitor
 License:        Apache-2.0