Logoj0ke.net Open Build Service > Projects > server:database:percona > nagios-plugins > Changes
Sign Up | Log In

Changes of Revision 7

[-] Changed nagios-plugins.spec
x
 
1
@@ -31,12 +31,17 @@
2
 BuildRequires: tcpd-devel libsmbclient libsmbclient-devel openldap2-devel perl-Net-SNMP fping glibc bind-utils
3
 %endif
4
 
5
-%if 0%{?fedora_version} || 0%{?centos_version}
6
+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?redhat_version} || 0%{?sl_version}
7
 BuildRequires:  tcp_wrappers openldap-devel freeradius samba-common openldap-devel net-snmp-perl glibc-common
8
 %endif
9
 
10
 BuildRequires: openssl-devel postgresql-devel Percona-Server-devel-51 Percona-Server-shared-51 zlib-devel glibc-devel libgcc gcc gcc-c++ net-snmp net-snmp-devel openssh qstat iputils samba-client procps
11
-Requires: qstat iputils samba-client
12
+Requires: qstat iputils
13
+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} || 0%{?redhat_version} || 0%{?sl_version}
14
+Requires: /usr/bin/smbclient
15
+%else
16
+Requires: samba-client
17
+%endif
18
 
19
 %description
20
 Nagios is a program that will monitor hosts and services on your
21
@@ -58,6 +63,8 @@
22
 --libexecdir=%{_prefix}/lib/nagios/plugins \
23
 --sysconfdir=%{_sysconfdir}/nagios \
24
 --datadir=%{_datadir} \
25
+--with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" \
26
+--with-ipv6 \
27
 --with-cgiurl=/nagios/cgi-bin \
28
 --with-rpcinfo-command=%{_sbindir}/rpcinfo \
29
 --with-mailq-command=%{_bindir}/mailq \
30
@@ -68,6 +75,7 @@
31
 %install
32
 rm -rf $RPM_BUILD_ROOT
33
 %__make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install-strip
34
+%__make AM_INSTALL_PROGRAM_FLAGS="" DESTDIR=${RPM_BUILD_ROOT} install-root
35
 %__install -d ${RPM_BUILD_ROOT}/etc/nagios
36
 %__install -m 664 command.cfg ${RPM_BUILD_ROOT}/etc/nagios
37
 %find_lang %{name}
38
@@ -81,6 +89,9 @@
39
 %clean
40
 rm -rf $RPM_BUILD_ROOT
41
 
42
+%post
43
+chmod 4711 %{_exec_prefix}/lib/nagios/plugins/check_icmp || :
44
+chmod 4711 %{_exec_prefix}/lib/nagios/plugins/check_dhcp || :
45
 
46
 %files -f %{name}.lang
47
 %defattr(-,root,root)
48
@@ -94,6 +105,18 @@
49
 %{_exec_prefix}/lib/nagios/plugins
50
 
51
 %changelog
52
+* Fri Nov 16 2012 Carsten Schonee <cs@linux-administrator.com> - 1.4.16-30
53
+- requires /usr/bin/smbclient on EL instead of samba-client
54
+
55
+* Tue Oct 02 2012 Carsten Schoene <cs@linux-administrator.com> - 1.4.16-29
56
+- update to upstream release 1.4.16
57
+
58
+* Thu Jun 30 2011 Carsten Schoene <cs@linux-administrator.com> - 1.4.15-28
59
+- added macros for rhel, redhat, scientific in BuildRequires
60
+
61
+* Sat Feb 05 2011 Carsten Schoene <cs@linux-administrator.com> - 1.4.15-27
62
+- build with --with-ipv6
63
+
64
 * Thu Sep 09 2010 Carsten Schoene <cs@linux-administrator.com> - 1.4.15-26
65
 - update to release 1.4.15
66
 
67