From b15c99d1ef4a949633e7624d0880d0da57426e881f66953e99d83310614ed4f5 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sun, 20 Feb 2022 21:31:48 +0000
Subject: [PATCH] Accepting request 956187 from home:wrosenauer:devel

- update to 2.0.69
  * bugfixes
  * Handle NVME drives in the Linux iostat plugin
  * munin-run: allow to pass additional arguments to the plugin
  * use dedicated munin SNMP plugin
- require the www group (boo#1195732)

OBS-URL: https://build.opensuse.org/request/show/956187
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/munin?expand=0&rev=71
---
 munin-2.0.66.tar.gz     |  3 ---
 munin-2.0.66.tar.gz.asc | 16 ----------------
 munin-2.0.69.tar.gz     |  3 +++
 munin.changes           | 10 ++++++++++
 munin.spec              | 11 +++++------
 5 files changed, 18 insertions(+), 25 deletions(-)
 delete mode 100644 munin-2.0.66.tar.gz
 delete mode 100644 munin-2.0.66.tar.gz.asc
 create mode 100644 munin-2.0.69.tar.gz

diff --git a/munin-2.0.66.tar.gz b/munin-2.0.66.tar.gz
deleted file mode 100644
index 4e3bf85..0000000
--- a/munin-2.0.66.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:24520ddb9e424cbc5d5552b8cb748bbb976c99ab1a996977208f80decb2e53a8
-size 2251620
diff --git a/munin-2.0.66.tar.gz.asc b/munin-2.0.66.tar.gz.asc
deleted file mode 100644
index 3101b9a..0000000
--- a/munin-2.0.66.tar.gz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEkQhGre5MXWfBmz5vCiTAWZi6QTMFAl/2KmIACgkQCiTAWZi6
-QTMkZRAAk5ZlgXglzGIyik4GNxvS22TP4zwbpbMAEkoMs8EBwup37zf7yNJNLNau
-9LOllctgW2Sr8u2w1Y+DfU9yYpALpM21mNPNQX48U2GlD/JCv5g/wK7xc0lswMij
-D7s2szmHrxdIvaSDXBRdc1aObA/mW9xqqpCpKu8PfKgk8aqKeecwaa6uZUuSGQh7
-8RoJM87EUOE10hvyfgm1A5shLvxnl75xwCtH8Ud4QEP8IZMFRvfB4+x5iMHEo7Sk
-HqbN0Y6MvjcyxLHIA3L5JVFr9WQiaTU6fziYlBItSZJRNBQHQ1cIjdHItc5+AElo
-HHg8gGONSVlJhiYusdiZK5TjjEyRAxm4r2g/KgIQTLApOYpfvdHmZhJVvlPOLcfc
-DOuikGybkG13JTwrtXJpj4tIHhqYtiteVh0EhQnDIiJO2O7PykwR6C+1SlEblcKW
-GsEF8kimlpiV2I6bYeEiXl4MB0MoIqSsG9FsLi2jXl8vU37bgDmG9lL9SSBeYRIY
-6CSL1toqsB/nNFt0dtdsq9Maj8EozRazPHb2EP0h4wF84wYP2PjsfJp4lMhswXoV
-gZzYtkC+mBS3HJZYL9NtH0Xy534nbeAxx5dW0RFLIIQmJWwYwAdBerrhkV85uDS8
-uV6UmrtJUq65z8A8BEWluM4SrPL2+eJgc5xOkjQc7vAGtBZL738=
-=xdux
------END PGP SIGNATURE-----
diff --git a/munin-2.0.69.tar.gz b/munin-2.0.69.tar.gz
new file mode 100644
index 0000000..395df3f
--- /dev/null
+++ b/munin-2.0.69.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bab332ee9320286ca5495f258ac1b384f8eb43022d7da5bbffbcc6b685b7b2c0
+size 2258024
diff --git a/munin.changes b/munin.changes
index 1af805b..055f259 100644
--- a/munin.changes
+++ b/munin.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Feb 20 10:39:50 UTC 2022 - Wolfgang Rosenauer <wr@rosenauer.org>
+
+- update to 2.0.69
+  * bugfixes
+  * Handle NVME drives in the Linux iostat plugin
+  * munin-run: allow to pass additional arguments to the plugin
+  * use dedicated munin SNMP plugin
+- require the www group (boo#1195732)
+
 -------------------------------------------------------------------
 Mon Nov 29 15:46:03 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
 
diff --git a/munin.spec b/munin.spec
index e8ad595..13c6489 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package munin
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,13 +24,13 @@
 %define active_by_default 0
 
 Name:           munin
-Version:        2.0.66
+Version:        2.0.69
 Release:        0
 Summary:        Network-wide graphing framework (grapher/gatherer)
 License:        GPL-2.0-only
 Group:          System/Monitoring
 URL:            http://munin-monitoring.org/
-Source0:        http://downloads.munin-monitoring.org/%{name}/stable/%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/munin-monitoring/munin/archive/refs/tags/%{name}-%{version}.tar.gz
 Source1:        Makefile.config
 Source2:        munin-node.rc
 Source3:        munin.cron.d
@@ -48,7 +48,7 @@ Source12:       nginx-munin.zip
 Source13:       gsa-munin.zip
 Source14:       munin-cron.timer
 Source15:       munin-cron.service
-Source16:       http://downloads.munin-monitoring.org/%{name}/stable/%{version}/%{name}-%{version}.tar.gz.asc
+#Source16:       http://downloads.munin-monitoring.org/%{name}/stable/%{version}/%{name}-%{version}.tar.gz.asc
 # 0x910846ADEE4C5D67C19B3E6F0A24C05998BA4133
 Source17:       munin.keyring
 Patch1:         perl526.patch
@@ -101,7 +101,6 @@ pages, suitable for viewing with your graphical web browser of choice.
 Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
 RRDtool.
 
-
 %package node
 Summary:        Network-wide graphing framework (node)
 # some scripts need logtail which is part of package logdigest in openSUSE
@@ -125,6 +124,7 @@ Requires:       ruby
 %{?systemd_ordering}
 Requires(pre):  group(nobody)
 Requires(pre):  user(nobody)
+Requires(pre):  group(www)
 Recommends:     logrotate
 BuildArch:      noarch
 
@@ -150,7 +150,6 @@ Munin is written in Perl, and relies heavily on Tobi Oetiker's excellent
 RRDtool. To see a real example of Munin in action, take a peek at
 <http://www.linpro.no/projects/munin/example/>.
 
-
 %prep
 %setup -q
 cp %{SOURCE1} .