From 76cba7fac3b5661a6007258bef3a5be9604e6e2f18e7ed4d1e72c0057a9c9215 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Mon, 19 Oct 2020 14:04:39 +0000
Subject: [PATCH] Accepting request 842546 from home:kukuk:container

- pwdutils is long gone, use shadow
- Don't hard require systemd
- Update to 2.0.64
  * several bugfixes in minor releases
  https://github.com/munin-monitoring/munin/blob/stable-2.0/ChangeLog

OBS-URL: https://build.opensuse.org/request/show/842546
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/munin?expand=0&rev=61
---
 munin-2.0.56.tar.gz |  3 ---
 munin-2.0.64.tar.gz |  3 +++
 munin.changes       |  9 +++++++++
 munin.spec          | 18 ++++++++++--------
 4 files changed, 22 insertions(+), 11 deletions(-)
 delete mode 100644 munin-2.0.56.tar.gz
 create mode 100644 munin-2.0.64.tar.gz

diff --git a/munin-2.0.56.tar.gz b/munin-2.0.56.tar.gz
deleted file mode 100644
index e100e09..0000000
--- a/munin-2.0.56.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62e1d9ed9b7fac0ff92edda84a5367f28cb95a2e3582122e2fa874069559d7f2
-size 2264291
diff --git a/munin-2.0.64.tar.gz b/munin-2.0.64.tar.gz
new file mode 100644
index 0000000..897a11f
--- /dev/null
+++ b/munin-2.0.64.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1323c17acc728f9541cc0a526a66bcc213b3a23e18310d2c83c16054b071ed86
+size 2249517
diff --git a/munin.changes b/munin.changes
index 0b112f9..e78f55d 100644
--- a/munin.changes
+++ b/munin.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep 29 11:17:39 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
+
+- pwdutils is long gone, use shadow
+- Don't hard require systemd
+- Update to 2.0.64
+  * several bugfixes in minor releases
+  https://github.com/munin-monitoring/munin/blob/stable-2.0/ChangeLog
+
 -------------------------------------------------------------------
 Wed Aug 19 10:11:07 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/munin.spec b/munin.spec
index edee8f9..d1320bd 100644
--- a/munin.spec
+++ b/munin.spec
@@ -24,7 +24,7 @@
 %define active_by_default 0
 
 Name:           munin
-Version:        2.0.56
+Version:        2.0.64
 Release:        0
 Summary:        Network-wide graphing framework (grapher/gatherer)
 License:        GPL-2.0-only
@@ -56,10 +56,10 @@ BuildRequires:  perl-Log-Log4perl
 BuildRequires:  perl-Net-SNMP
 BuildRequires:  perl-Net-SSLeay
 BuildRequires:  perl-Net-Server
-BuildRequires:  pwdutils
+BuildRequires:  shadow
 BuildRequires:  unzip
 BuildRequires:  perl(Module::Build)
-%{?systemd_requires}
+%{?systemd_ordering}
 BuildRequires:  htmldoc
 BuildRequires:  pkgconfig(systemd)
 Requires:       perl-Date-Manip
@@ -74,8 +74,8 @@ Requires:       perl-Net-Server
 Requires:       perl-URI
 Requires:       perl-base = %{perl_version}
 Requires:       perl-rrdtool
-Requires:       pwdutils
 Requires:       rrdtool
+Requires:       shadow
 Requires:       spawn-fcgi
 Requires:       perl(Munin::Common::Defaults)
 Recommends:     logrotate
@@ -114,12 +114,12 @@ Requires:       perl-Net-Server
 Requires:       perl-base = %{perl_version}
 Requires:       perl-libwww-perl
 Requires:       ps
-Requires:       pwdutils
+Requires:       shadow
 Requires:       sysstat
 # manual requires from certain plugins using "env ..."
 Requires:       python
 Requires:       ruby
-%{?systemd_requires}
+%{?systemd_ordering}
 Requires(pre):  group(nobody)
 Requires(pre):  user(nobody)
 Recommends:     logrotate
@@ -223,7 +223,7 @@ chmod 755 %{dbdir}
 touch %{logdir}/munin-graph.log %{logdir}/munin-html.log %{logdir}/munin-nagios.log %{logdir}/munin-limits.log %{logdir}/munin-update.log
 chown munin:munin %{logdir}/*
 chown root:root %{logdir}/munin-node.log* >/dev/null 2>&1 || true
-systemd-tmpfiles --create /usr/lib/tmpfiles.d/munin.conf
+%tmpfiles_create munin.conf
 %service_add_post munin-cgi-graph.service
 %service_add_post munin-cgi-html.service
 %if 0%{?suse_version} > 1510
@@ -268,7 +268,7 @@ touch %{logdir}/munin-node.log
 chown munin:munin %{logdir}/*
 chown root:root %{logdir}/munin-node.log*
 chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
-%tmpfiles_create /usr/lib/tmpfiles.d/munin-node.conf
+%tmpfiles_create munin-node.conf
 %service_add_post munin-node.service
 %firewalld_reload
 
@@ -381,6 +381,7 @@ chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
 %config %{_sysconfdir}/logrotate.d/munin-node
 %dir %{perl_vendorlib}/Munin/Common
 %{perl_vendorlib}/Munin/Common/Config.pm
+%{perl_vendorlib}/Munin/Common/Daemon.pm
 %{perl_vendorlib}/Munin/Common/Defaults.pm
 %{perl_vendorlib}/Munin/Common/TLS.pm
 %{perl_vendorlib}/Munin/Common/TLSClient.pm
@@ -415,6 +416,7 @@ chown -R nobody:nobody %{dbdir}/plugin-state/* >/dev/null 2>&1
 %{_mandir}/man1/munindoc.1.gz
 %{_mandir}/man1/munin-get.1.gz
 %{_mandir}/man3/Munin::Common::Config.3pm.gz
+%{_mandir}/man3/Munin::Common::Daemon.3pm.gz
 %{_mandir}/man3/Munin::Common::Defaults.3pm.gz
 %{_mandir}/man3/Munin::Common::TLS.3pm.gz
 %{_mandir}/man3/Munin::Common::TLSClient.3pm.gz