averi pushed to check-mk (el6). "Do not require any other shell than bash since that's the default shell for the Fedora / RHEL distributions'"

[notifications at fedoraproject.org]

>From 0d1df8a8b9823524c960ffcbc30bf60ad5785a16 Mon Sep 17 00:00:00 2001
From: Andrea Veri <av at gnome.org>
Date: Tue, 30 Sep 2014 01:48:29 +0200
Subject: Do not require any other shell than bash since that's the default
 shell for the Fedora / RHEL distributions'


diff --git a/check-mk.spec b/check-mk.spec
index c04594b..e95775b 100644
--- a/check-mk.spec
+++ b/check-mk.spec
@@ -2,7 +2,7 @@
 
 Name:		check-mk
 Version:	1.2.4p5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A new general purpose Nagios-plugin for retrieving data
 Group:		Applications/Internet
 License:	GPLv2 and GPLv3
@@ -15,12 +15,24 @@ Requires:	mod_python
 Source1:	First-Installation.txt
 Source2:	defaults
 Source3:	defaults.py
-Patch0:     01-Set-Legacy-Eval-True.patch
+Patch0:		01-Set-Legacy-Eval-True.patch
 AutoReq:	0
 
 # Do not provide from a documentation
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_docdir}/.*$
 
+# Do not require any other shell than bash since that's the default Fedora / RHEL shell
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+%global __requires_exclude %{?__requires_exclude}|^/bin/sh$
+%global __requires_exclude %{?__requires_exclude}|^/usr/bin/ksh$
+%endif
+
+%if 0%{?rhel} == 6
+%filter_from_requires /^\/bin\/sh/d
+%filter_from_requires /^\/usr\/bin\/ksh/d
+%filter_setup
+%endif
+
 %description
 check-mk is a general purpose Nagios-plugin for retrieving data. It adopts a
 new approach for collecting data from operating systems and network components.
@@ -271,6 +283,10 @@ rmdir %{buildroot}%{_prefix}/lib/check_mk
 %{_libdir}/check_mk
 
 %changelog
+* 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
+  shell for the Fedora / RHEL distributions.
+
 * Wed Sep 17 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p5-1
 - New upstream release. Fixes CVEs:
   - CVE-2014-5338 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/check-mk.git/commit/?h=el6&id=0d1df8a8b9823524c960ffcbc30bf60ad5785a16