From 26e174d6e5b53ad7c0a5cc87823574a89250807c6cf6d33eea1055e11963eac5 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Wed, 7 Jan 2015 10:00:01 +0000
Subject: [PATCH] Accepting request 280130 from home:wrosenauer:devel

OBS-URL: https://build.opensuse.org/request/show/280130
OBS-URL: https://build.opensuse.org/package/show/server:monitoring/munin?expand=0&rev=19
---
 munin-2.0.24.tar.gz |  3 ---
 munin-2.0.25.tar.gz |  3 +++
 munin.changes       | 15 +++++++++++++++
 munin.spec          | 23 +++++++++++------------
 4 files changed, 29 insertions(+), 15 deletions(-)
 delete mode 100644 munin-2.0.24.tar.gz
 create mode 100644 munin-2.0.25.tar.gz

diff --git a/munin-2.0.24.tar.gz b/munin-2.0.24.tar.gz
deleted file mode 100644
index d50a87b..0000000
--- a/munin-2.0.24.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74940896326bbb33d5607c39d1f972f69c5fc4278c93ae185338113a62a6a4e6
-size 1337330
diff --git a/munin-2.0.25.tar.gz b/munin-2.0.25.tar.gz
new file mode 100644
index 0000000..281d52d
--- /dev/null
+++ b/munin-2.0.25.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6832bc5839d03639e4309178d9370697fc8a80a83d9b6653953f40161e949694
+size 1337586
diff --git a/munin.changes b/munin.changes
index 475428e..4e5c47e 100644
--- a/munin.changes
+++ b/munin.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Jan  7 08:07:48 UTC 2015 - wr@rosenauer.org
+
+- update to version 2.0.25
+  Bugfix release.
+  Closes: GH:304, D:769415, D:770745, D:770746, D:770826
+  * p/irqstats: Improve generated labels
+  * ip/iostat_ios: also support /dev/xvdX devices
+  * p/iostat_ios: also support /dev/vdX devices
+  * plugins/df_abs: fix the naming for regular devices
+  * p/pgsql: Detect "rc" postgresql versions
+  * p/ping_: honor ping env variable
+- cleanup sysvinit scriptlets to fix the issue which always
+  disabled the service on update
+
 -------------------------------------------------------------------
 Sun Nov  2 22:26:03 UTC 2014 - wr@rosenauer.org
 
diff --git a/munin.spec b/munin.spec
index b6e49fc..519f06b 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package munin
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
 %define 	active_by_default 0
 
 Name:           munin
-Version:        2.0.24
+Version:        2.0.25
 Release:        0
 Summary:        Network-wide graphing framework (grapher/gatherer)
 License:        GPL-2.0
@@ -61,6 +61,7 @@ BuildRequires:  htmldoc
 BuildRequires:  systemd
 %else
 BuildRequires:  sysvinit
+Requires(pre):  %insserv_prereq
 %endif
 Requires:       perl-Date-Manip
 Requires:       perl-FastCGI
@@ -112,6 +113,11 @@ Requires:       perl-libwww-perl
 Requires:       ps
 Requires:       pwdutils
 Requires:       sysstat
+%if 0%{?suse_version} >= 1220
+%{?systemd_requires}
+%else
+Requires(pre):  %insserv_prereq
+%endif
 Recommends:     logrotate
 BuildArch:      noarch
 
@@ -238,11 +244,11 @@ getent passwd munin > /dev/null || /usr/sbin/useradd -r -c "munin monitoring" -d
 
 %post node
 if [ $1 = 1 ]; then
-%if 0%{?suse_version} < 1220
-	/sbin/chkconfig --add munin-node
-%endif
 /usr/sbin/munin-node-configure --shell | sh
 fi
+%if 0%{?suse_version} < 1220
+%fillup_and_insserv -f -y munin-node
+%endif
 chown -R munin:munin %{dbdir}
 chmod 755 %{dbdir}
 touch %{logdir}/munin-node.log
@@ -259,13 +265,6 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/munin-node.conf
 %endif
 
 %preun node
-if [ $1 = 1 ] ; then
-%if 0%{?suse_version} < 1220
-	/sbin/service munin-node stop >/dev/null 2>&1
-	/sbin/chkconfig --del munin-node
-%endif
-rmdir %{logdir} 2>/dev/null || true
-fi
 %if 0%{?suse_version} >= 1220
 %service_del_preun munin-node.service
 %else