Attachment 616558 Details for Bug 859956 – patch

[patch] patch

0001-fedora-rhel-macro-corrections.patch (text/plain), 2.77 KB, created by Mark Chappell on 2012-09-24 13:28:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Chappell

Created: 2012-09-24 13:28:47 UTC

Size: 2.77 KB

patch

obsolete

>From aefc76ee6c6a31d3cad591186d8e8e0b31f4ce17 Mon Sep 17 00:00:00 2001
>From: Mark Chappell <mchappel@redhat.com>
>Date: Mon, 24 Sep 2012 14:16:15 +0200
>Subject: [PATCH] fedora/rhel macro corrections
>
>---
> munin.spec |   18 ++++++++++--------
> 1 files changed, 10 insertions(+), 8 deletions(-)
>
>diff --git a/munin.spec b/munin.spec
>index 749872d..faedefe 100644
>--- a/munin.spec
>+++ b/munin.spec
>@@ -1,6 +1,6 @@
> Name:           munin
> Version:        2.0.6
>-Release:        2%{?dist}
>+Release:        3%{?dist}
> Summary:        Network-wide graphing framework (grapher/gatherer)
> 
> Group:          System Environment/Daemons
>@@ -99,16 +99,15 @@ Requires:       perl(Net::SSLeay)
> Requires:       perl(Time::HiRes)
> 
> # Munin node java monitor requires
>-#Requires:       java-jmx
>+%if ! (0%{?rhel} > 6 || 0%{?fedora} > 16)
> # java buildrequires on fedora < 17 and rhel
>-%if 0%{?rhel} > 4 || 0%{?fedora} < 17
> BuildRequires:  java-1.6.0-devel
> BuildRequires:  mx4j
> BuildRequires:  jpackage-utils
> %endif
> 
>+%if 0%{?rhel} > 6 || 0%{?fedora} > 16
> # java buildrequires on fedora 17 and higher
>-%if 0%{?fedora} > 16
> BuildRequires:  java-1.7.0-devel
> BuildRequires:  mx4j
> BuildRequires:  jpackage-utils
>@@ -289,7 +288,7 @@ install -m 0644 %{SOURCE14} %{buildroot}/lib/systemd/system/munin-asyncd.service
> install -m 0644 %{SOURCE15} %{buildroot}/lib/systemd/system/munin-fcgi-html.service
> install -m 0644 %{SOURCE16} %{buildroot}/lib/systemd/system/munin-fcgi-graph.service
> %endif
>-%if 0%{?fedora} > 16
>+%if 0%{?fedora} > 16 || 0%{?rhel} > 6
> install -m 0644 %{SOURCE11} %{buildroot}/lib/systemd/system/munin-node.service
> install -m 0644 %{SOURCE14} %{buildroot}/lib/systemd/system/munin-asyncd.service
> install -m 0644 %{SOURCE15} %{buildroot}/lib/systemd/system/munin-fcgi-html.service
>@@ -303,7 +302,7 @@ install -m 0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
> %endif
> 
> # Fedora 15 and rhel use sysvinit / upstart
>-%if 0%{?rhel} > 4 || 0%{?fedora} < 16
>+%if ! (0%{?rhel} > 6 || 0%{?fedora} > 15)
> mkdir -p %{buildroot}/etc/rc.d/init.d
> cat dists/redhat/munin-node.rc | sed -e 's/2345/\-/' > %{buildroot}/etc/rc.d/init.d/munin-node
> chmod 755 %{buildroot}/etc/rc.d/init.d/munin-node
>@@ -383,8 +382,8 @@ exit 0
> exit 0
> 
> %post node
>-# sysvinit only in f15 and older and epel
>-%if 0%{?fedora} < 16 || 0%{?rhel} > 4
>+# sysvinit only in f15 and older
>+%if ! (0%{?rhel} > 6 || 0%{?fedora} > 15)
> /sbin/chkconfig --add munin-node
> %endif
> # Only run configure on a new install, not an upgrade.
>@@ -536,6 +535,9 @@ exit 0
> 
> 
> %changelog
>+* Mon Sep 24 2012 Mark Chappell <tremble@tremble.org.uk> - 2.0.6-3
>+- Minor fedora/rhel macro corrections
>+
> * Sat Sep 08 2012 D. Johnson <fenris02@fedoraproject.org> - 2.0.6-2
> - node: remove File::Path as it is no longer needed.
> - added DBDIRNODE for munin-node.
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 859956: 616558