averi pushed to check-mk (el6). "Drop the filter_from_requires rule and the php require as they will now be picked up correctly from the automatic RPM requires generator"

[notifications at fedoraproject.org]

>From 6b88698e009dfc0591e4ea73846a66444e231264 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Fri, 10 Apr 2015 15:56:32 +0200
Subject: Drop the filter_from_requires rule and the php require as they will
 now be picked up correctly from the automatic RPM requires generator


diff --git a/check-mk.spec b/check-mk.spec
index a94c531..90786f0 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -37,7 +37,6 @@ AutoReq:    0
 %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
 
@@ -56,7 +55,6 @@ 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
@@ -183,12 +181,12 @@ 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
+# Fix the shebang on agents/plugins/unitrends_backup and on web/plugins/unitrends_backup
 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
+  %{buildroot}%{_datadir}/check_mk/web/plugins/unitrends_backup
 
 # Copy the check_mk_templates.cfg from the example file and remove the file installed
 # on the /etc/nagios/objects directory.
@@ -243,7 +241,6 @@ rm -rf %{buildroot}%{_docdir}/check_mk/treasures/windows_msi/
 rm -rf %{buildroot}%{_docdir}/check_mk/treasures/msexchange/
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/windows/
 
-
 # Remove DEB and RPM files that upstream ships
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent-%{version}-%{nodistrelease}.noarch.rpm
 rm -rf %{buildroot}%{_datadir}/check_mk/agents/check-mk-agent.spec
@@ -363,9 +360,7 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
   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.
+  as that is a non-existent binary file, upstream probably meant php.
 
 * 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=el6&id=6b88698e009dfc0591e4ea73846a66444e231264