averi pushed to check-mk (master). "Filter the /usr/bin/bash require on EL 6 as it's available under /bin/bash, (..more)"

[notifications at fedoraproject.org]

>From 99aa57f4dac59ddc1450cd237e26138ccc59c91e Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Fri, 10 Apr 2015 15:32:10 +0200
Subject: Filter the /usr/bin/bash require on EL 6 as it's available under
 /bin/bash, additionally fix the /usr/bin/pnp shebang from the
 plugins/unitrends_backup file as that is a non-existent binary file, upstream
 probably meant php. Also add a requires on php for the agent subpackage as
 plugins/unitrends_backup demands it.


diff --git a/check-mk.spec b/check-mk.spec
index 26654df..dfaec28 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -36,6 +36,8 @@ AutoReq:    0
 %if 0%{?rhel} == 6
 %filter_from_requires /^\/bin\/sh/d
 %filter_from_requires /^\/usr\/bin\/ksh/d
+%filter_from_requires /^\/usr\/bin\/bash/d
+%filter_from_requires /^\/usr\/bin\/php/d
 %filter_setup
 %endif
 
@@ -54,6 +56,7 @@ the Nagios host and an automatic inventory of items to be checked on hosts.
 %package agent
 Summary:    The check-mk's Agent
 Requires:   xinetd
+Requires:   php
 Group:      Applications/Internet
 
 %description agent
@@ -180,6 +183,13 @@ for file in `find %{buildroot}%{_datadir}/check_mk/web -name '*.py'`; do
  sed -i '1{\@^#!/usr/bin/python at d}' $file
 done
 
+# Fix the shebang on agents/plugins/unitrends_backup and on doc/helpers/headrify
+sed -i 's|#!/usr/bin/pnp|#!/usr/bin/php|1' \
+  %{buildroot}%{_datadir}/check_mk/agents/plugins/unitrends_backup
+
+sed -i 's|#!/usr/bin/pnp|#!/usr/bin/php|1' \
+  %{buildroot}%{_docdir}/check_mk/helpers/headrify
+
 # Copy the check_mk_templates.cfg from the example file and remove the file installed
 # on the /etc/nagios/objects directory.
 mkdir -p %{buildroot}%{_sysconfdir}/nagios/conf.d/
@@ -348,6 +358,11 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
   when a downtime is set. This was caused by a change on the downtime struct
   applied in the course of Nagios 3's development. Thanks Mike Battersby for
   the patch. (BZ: #1083003)
+- Filter the /usr/bin/bash require on EL 6 as it's available under /bin/bash,
+  additionally fix the /usr/bin/pnp shebang from the plugins/unitrends_backup file
+  as that is a non-existent binary file, upstream probably meant php. Also
+  add a requires on php for the agent subpackage as plugins/unitrends_backup demands
+  it.
 
 * Tue Sep 30 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p5-2
 - Do not require any other shell than bash since that's the default
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/check-mk.git/commit/?h=master&id=99aa57f4dac59ddc1450cd237e26138ccc59c91e