[check-mk/el6] Do not require any other shell than bash since that's the default shell for the Fedora / RHEL distri

averi averi at fedoraproject.org
Mon Sep 29 23:53:47 UTC 2014


commit 52ea62f84240c18bcc13cf880abb000c824b1ea2
Author: Andrea Veri <av at gnome.org>
Date:   Tue Sep 30 01:53:38 2014 +0200

    Do not require any other shell than bash since that's the default shell for the Fedora / RHEL distributions'

 check-mk.spec |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/check-mk.spec b/check-mk.spec
index 64ca860..426b1b6 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
@@ -21,6 +21,18 @@ 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 


More information about the scm-commits mailing list