projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1729122
)
RPM specfile: include new notify_nagios plugin in package
author
Marc Fournier
<marc.fournier@camptocamp.com>
Tue, 1 Dec 2015 17:14:57 +0000
(18:14 +0100)
committer
Marc Fournier
<marc.fournier@camptocamp.com>
Tue, 1 Dec 2015 17:14:57 +0000
(18:14 +0100)
contrib/redhat/collectd.spec
patch
|
blob
|
history
diff --git
a/contrib/redhat/collectd.spec
b/contrib/redhat/collectd.spec
index
2252181
..
4dfcc9a
100644
(file)
--- a/
contrib/redhat/collectd.spec
+++ b/
contrib/redhat/collectd.spec
@@
-130,6
+130,7
@@
%define with_nginx 0%{!?_without_nginx:1}
%define with_notify_desktop 0%{!?_without_notify_desktop:1}
%define with_notify_email 0%{!?_without_notify_email:1}
%define with_nginx 0%{!?_without_nginx:1}
%define with_notify_desktop 0%{!?_without_notify_desktop:1}
%define with_notify_email 0%{!?_without_notify_email:1}
+%define with_notify_nagios 0%{!?_without_notify_nagios:1}
%define with_ntpd 0%{!?_without_ntpd:1}
%define with_numa 0%{!?_without_numa:1}
%define with_nut 0%{!?_without_nut:1}
%define with_ntpd 0%{!?_without_ntpd:1}
%define with_numa 0%{!?_without_numa:1}
%define with_nut 0%{!?_without_nut:1}
@@
-1233,6
+1234,12
@@
Collectd utilities
%define _with_notify_email --disable-notify_email
%endif
%define _with_notify_email --disable-notify_email
%endif
+%if %{with_notify_nagios}
+%define _with_notify_nagios --enable-notify_nagios
+%else
+%define _with_notify_nagios --disable-notify_nagios
+%endif
+
%if %{with_ntpd}
%define _with_ntpd --enable-ntpd
%else
%if %{with_ntpd}
%define _with_ntpd --enable-ntpd
%else
@@
-1711,6
+1718,7
@@
Collectd utilities
%{?_with_memory} \
%{?_with_network} \
%{?_with_nfs} \
%{?_with_memory} \
%{?_with_network} \
%{?_with_nfs} \
+ %{?_with_notify_nagios} \
%{?_with_ntpd} \
%{?_with_numa} \
%{?_with_olsrd} \
%{?_with_ntpd} \
%{?_with_numa} \
%{?_with_olsrd} \
@@
-1977,6
+1985,9
@@
fi
%if %{with_nfs}
%{_libdir}/%{name}/nfs.so
%endif
%if %{with_nfs}
%{_libdir}/%{name}/nfs.so
%endif
+%if %{with_notify_nagios}
+%{_libdir}/%{name}/notify_nagios.so
+%endif
%if %{with_ntpd}
%{_libdir}/%{name}/ntpd.so
%endif
%if %{with_ntpd}
%{_libdir}/%{name}/ntpd.so
%endif
@@
-2370,7
+2381,7
@@
fi
%changelog
#* TODO: next feature release changelog
#- New upstream version
%changelog
#* TODO: next feature release changelog
#- New upstream version
-#- New plugins enabled by default: mqtt
+#- New plugins enabled by default: mqtt
, notify_nagios
#- New plugins disabled by default: zone
#
* Wed May 27 2015 Marc Fournier <marc.fournier@camptocamp.com> 5.5.0-1
#- New plugins disabled by default: zone
#
* Wed May 27 2015 Marc Fournier <marc.fournier@camptocamp.com> 5.5.0-1