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
This commit is contained in:
Wolfgang Rosenauer 2015-01-07 10:00:01 +00:00 committed by Git OBS Bridge
parent 7d60ab6736
commit 26e174d6e5
4 changed files with 29 additions and 15 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74940896326bbb33d5607c39d1f972f69c5fc4278c93ae185338113a62a6a4e6
size 1337330

3
munin-2.0.25.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6832bc5839d03639e4309178d9370697fc8a80a83d9b6653953f40161e949694
size 1337586

View File

@ -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

View File

@ -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