Attachment 618024 Details for Bug 860988 – patch

[patch] patch

0003-Various-future-epel-fixes.patch (text/plain), 2.54 KB, created by Mark Chappell on 2012-09-27 11:39:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Chappell

Created: 2012-09-27 11:39:17 UTC

Size: 2.54 KB

patch

obsolete

>From 5217cf08d974f0a2fc3c5be511481a0474eb16af Mon Sep 17 00:00:00 2001
>From: Mark Chappell <mchappel@redhat.com>
>Date: Thu, 27 Sep 2012 11:03:27 +0200
>Subject: [PATCH 3/3] Various future epel fixes
>
>---
> nrpe.spec |   14 +++++++-------
> 1 files changed, 7 insertions(+), 7 deletions(-)
>
>diff --git a/nrpe.spec b/nrpe.spec
>index adfea5e..9f6a7aa 100644
>--- a/nrpe.spec
>+++ b/nrpe.spec
>@@ -90,7 +90,7 @@ make %{?_smp_mflags} all
> 
> %install
> rm -rf %{buildroot}
>-%if 0%{?fedora} > 17
>+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
> install -D -m 0644 -p %{SOURCE3} %{buildroot}%{_unitdir}/%{name}.service
> %else
> install -D -p -m 0755 init-script %{buildroot}/%{_initrddir}/nrpe
>@@ -101,7 +101,7 @@ install -D -p -m 0755 src/check_nrpe %{buildroot}/%{_libdir}/nagios/plugins/chec
> install -D -p -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
> install -d %{buildroot}%{_sysconfdir}/nrpe.d
> install -d %{buildroot}%{_localstatedir}/run/%{name}
>-%if 0%{?fedora} > 14
>+%if 0%{?fedora} > 14 || 0%{?rhel} > 6
> install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
> %endif
> 
>@@ -115,7 +115,7 @@ getent passwd %{name} >/dev/null || \
> %{_sbindir}/useradd -c "NRPE user for the NRPE service" -d %{_localstatedir}/run/%{name} -r -g %{name} -s /sbin/nologin %{name} 2> /dev/null || :
> 
> %preun
>-%if 0%{?fedora} > 17
>+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
> if [ $1 -eq 0 ] ; then
>     # Package removal, not upgrade
>     /bin/systemctl --no-reload disable %{name}.service > /dev/null 2>&1 || :
>@@ -129,7 +129,7 @@ fi
> %endif
> 
> %post
>-%if 0%{?fedora} > 17
>+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
> if [ $1 -eq 1 ] ; then
>     # Initial installation
>     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>@@ -144,7 +144,7 @@ if [ "$1" -ge "1" ]; then
> fi
> 
> 
>-%if 0%{?fedora} > 17
>+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
> %triggerun -- %{name} < 2.13
> # Save the current service runlevel info
> # User must manually run systemd-sysv-convert --apply opensips
>@@ -160,7 +160,7 @@ chown -R %{name}:%{name} %{_localstatedir}/cache/%{name}
> 
> 
> %files
>-%if 0%{?fedora} > 17
>+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
> %{_unitdir}/%{name}.service
> %else
> %{_initrddir}/nrpe
>@@ -169,7 +169,7 @@ chown -R %{name}:%{name} %{_localstatedir}/cache/%{name}
> %dir %{_sysconfdir}/nrpe.d
> %config(noreplace) %{_sysconfdir}/nagios/nrpe.cfg
> %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
>-%if 0%{?fedora} > 14
>+%if 0%{?fedora} > 14 || 0%{?rhel} > 6
> %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
> %endif
> %doc Changelog LEGAL README README.SSL SECURITY docs/NRPE.pdf
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 860988: 618024