Logoj0ke.net Open Build Service > Projects > home:netmax > nagios-plugins > Changes
Sign Up | Log In

Changes of Revision 65

[-] Changed nagios-plugins.spec
x
 
1
@@ -48,9 +48,15 @@
2
 %endif
3
 
4
 
5
+
6
 %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?redhat_version} || 0%{?sl_version}
7
+%if 0%{?rhel} == 8
8
+BuildRequires: openldap-devel freeradius samba-common openldap-devel glibc-common qstat
9
+%else
10
 BuildRequires:  tcp_wrappers openldap-devel freeradius samba-common openldap-devel net-snmp-perl glibc-common qstat
11
 %endif
12
+%endif
13
+
14
 
15
 # fping is in EPEL for EL
16
 BuildRequires: openssl-devel postgresql-devel mysql-devel zlib-devel glibc-devel gcc gcc-c++ net-snmp net-snmp-devel openssh iputils samba-client procps fping 
17
@@ -93,9 +99,6 @@
18
 --sysconfdir=%{_sysconfdir}/nagios \
19
 --datadir=%{_datadir} \
20
 --with-perl=/usr/bin/perl \
21
-%if 0%{?centos_version} >= 700 || 0%{?rhel_version} >= 700 || 0%{?rhel} >= 7 || 0%{?sl_version} >= 700
22
---with-ping-command="/bin/ping -n -U -w %d -c %d %s" \
23
-%endif
24
 --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" \
25
 --with-fping-command=%{_sbindir}/fping \
26
 --with-fping6-command=%{_sbindir}/fping6 \
27
@@ -117,6 +120,9 @@
28
 # fix lib path in perl plugins
29
 cd ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/plugins
30
 # set qmail-qstat if not found
31
+# fix lib path in perl plugins
32
+cd ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/plugins
33
+# set qmail-qstat if not found
34
 sed -i s@'$PATH_TO_QMAIL_QSTAT = "";'@'$PATH_TO_QMAIL_QSTAT = "/var/qmail/bin/qmail-qstat";'@ %{buildroot}%{_prefix}/lib/nagios/plugins/utils.pm
35
 sed -i s@"{'PATH'}='';"@"{'PATH'}='/usr/bin:/usr/sbin';"@ %{buildroot}%{_prefix}/lib/nagios/plugins/check_mailq 
36
 
37
@@ -277,6 +283,3 @@
38
   all generated plugins (which keeps the build from failing on systems that
39
   don't have all build-dependencies for every plugin)
40
 * Tue Mar 04 2004 Karl DeBisschop <karl[AT]debisschop.net> - 1.4.0alpha1
41
-- extensive rewrite to facilitate processing into various distro-compatible specs
42
-* Tue Mar 04 2004 Karl DeBisschop <karl[AT]debisschop.net> - 1.4.0alpha1
43
-- extensive rewrite to facilitate processing into various distro-compatible specs
44