From 7123ff4cdcb5b5d10dfb5e9db6534b310912858e Mon Sep 17 00:00:00 2001
From: d. johnson <fenris02@fedoraproject.org>
Date: Dec 10 2016 23:00:45 +0000
Subject: RHBZ#: 1392279 - munin-node.rpm requires munin.rpm


---

diff --git a/759.patch b/759.patch
new file mode 100644
index 0000000..5dbc8b1
--- /dev/null
+++ b/759.patch
@@ -0,0 +1,63 @@
+From 7ce6caf329349da37ac0e3e701dcd78a2894ac67 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 5 Dec 2016 15:44:32 +0900
+Subject: [PATCH] Revert "munin_stats plugin: only graph munin-graph if
+ graph_strategy=cron"
+
+This reverts commit ec3128b4be6511d589056b8c190eb7c414b52b0f.
+
+Fixes #745.
+---
+ plugins/node.d/munin_stats.in | 23 ++++++-----------------
+ 1 file changed, 6 insertions(+), 17 deletions(-)
+
+diff --git a/plugins/node.d/munin_stats.in b/plugins/node.d/munin_stats.in
+index f7a7939..d85a2cb 100644
+--- a/plugins/node.d/munin_stats.in
++++ b/plugins/node.d/munin_stats.in
+@@ -27,14 +27,9 @@ use strict;
+ use warnings;
+ 
+ use Munin::Plugin;
+-use Munin::Master::GraphOld;
+ 
+-my @logs = qw/update html limits/;
++my @logs = qw/update graph html limits/;
+ my $logdir = ($ENV{'logdir'} || $ENV{'MUNIN_LOGDIR'} || '@@LOGDIR@@');
+-my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
+-if (! graph_check_cron() ) {
+-     push  (@logs, "graph");
+-}
+ 
+ if ($ARGV[0] and $ARGV[0] eq 'autoconf') {
+     my $munin_update_location = 
+@@ -56,13 +51,9 @@ if ($ARGV[0] and $ARGV[0] eq 'autoconf') {
+ }
+ 
+ if ($ARGV[0] and $ARGV[0] eq "config") {
+-    print "graph_title Munin processing time\n";
+-    if (! graph_check_cron() ) {
+-        print  "graph_info This graph shows the run time of the four different processes making up a munin-master run.  Munin-master is run from cron every 5 minutes and we want each of the programmes in munin-master to complete before the next instance starts.  Especially munin-update and munin-graph are time consuming and their run time bears watching. If munin-update uses too long time to run please see the munin-update graph to determine which host is slowing it down.  If munin-graph is running too slow you need to get clever (email the munin-users mailing list) unless you can buy a faster computer with better disks to run munin on.\n";
+-    } else {
+-        print  "graph_info This graph shows the run time of the three different processes making up a munin-master run.  Munin-master is run from cron every 5 minutes and we want each of the programmes in munin-master to complete before the next instance starts.  Especially munin-update is time consuming and its run time bears watching. If munin-update uses too long time to run please see the munin-update graph to determine which host is slowing it down.\n";
+-    }
+-    print "graph_args --base 1000 -l 0\n",
++    print "graph_title Munin processing time\n",
++          "graph_info This graph shows the run time of the four different processes making up a munin-master run.  Munin-master is run from cron every 5 minutes and we want each of the programmes in munin-master to complete before the next instance starts.  Especially munin-update and munin-graph are time consuming and their run time bears watching. If munin-update uses too long time to run please see the munin-update graph to determine which host is slowing it down.  If munin-graph is running too slow you need to get clever (email the munin-users mailing list) unless you can buy a faster computer with better disks to run munin on.\n",
++          "graph_args --base 1000 -l 0\n",
+           "graph_scale yes\n",
+           "graph_vlabel seconds\n",
+           "graph_category munin\n";
+@@ -72,10 +63,8 @@ if ($ARGV[0] and $ARGV[0] eq "config") {
+     }
+     print "update.warning 240\n";
+     print "update.critical 285\n";
+-    if (! graph_check_cron() ) {
+-        print "graph.warning 240\n";
+-        print "graph.critical 285\n";
+-    }
++    print "graph.warning 240\n";
++    print "graph.critical 285\n";
+     exit 0;
+ }
+ 
diff --git a/munin.spec b/munin.spec
index 0c1612c..3769c84 100644
--- a/munin.spec
+++ b/munin.spec
@@ -1,6 +1,6 @@
 Name:           munin
 Version:        2.0.28
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Network-wide graphing framework (grapher/gatherer)
 
 Group:          System Environment/Daemons
@@ -50,6 +50,7 @@ Patch12:        bz1049262-ntp_.patch
 Patch13:        mariadb-show-status.patch
 Patch14:        mariadb-innodb.patch
 #Patch15:        https://patch-diff.githubusercontent.com/raw/munin-monitoring/munin/pull/737.patch
+Patch16:        https://patch-diff.githubusercontent.com/raw/munin-monitoring/munin/pull/759.patch
 
 BuildArch:      noarch
 
@@ -353,6 +354,7 @@ rm -f plugins/node.d/memcached_.in
 %patch13 -p1
 %patch14 -p1
 #% patch15 -p1
+%patch16 -p1
 install -c %{SOURCE13} ./resources/
 
 # Create Makefile.config-dist
@@ -868,6 +870,9 @@ exit 0
 
 
 %changelog
+* Sat Dec 10 2016 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.28-2
+- RHBZ#: 1392279 - munin-node.rpm requires munin.rpm
+
 * Mon Dec 05 2016 "D. Johnson" <fenris02@fedoraproject.org> - 2.0.28-1
 - Upstream released 2.0.28