SPECS: collectd.spec - added nut and ipmi plugins - rel 3, STBR
luzik
luzik at pld-linux.org
Tue Aug 5 07:54:17 CEST 2008
Author: luzik Date: Tue Aug 5 05:54:17 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added nut and ipmi plugins
- rel 3, STBR
---- Files affected:
SPECS:
collectd.spec (1.31 -> 1.32)
---- Diffs:
================================================================
Index: SPECS/collectd.spec
diff -u SPECS/collectd.spec:1.31 SPECS/collectd.spec:1.32
--- SPECS/collectd.spec:1.31 Thu Jul 31 18:01:56 2008
+++ SPECS/collectd.spec Tue Aug 5 07:54:11 2008
@@ -21,7 +21,7 @@
# hddtemp . . . . . . yes
# interface . . . . . yes
# iptables . . . . . yes
-# ipmi . . . . . . . no
+# ipmi . . . . . . . yes
# ipvs . . . . . . . no (ip_vs.h not found)
# irq . . . . . . . . yes
# libvirt . . . . . . no
@@ -30,14 +30,14 @@
# mbmon . . . . . . . yes
# memcached . . . . . yes
# memory . . . . . . yes
-# multimeter . . . . yes
+# multimeter . . . . no
# mysql . . . . . . . yes
# netlink . . . . . . yes
# network . . . . . . yes
# nfs . . . . . . . . yes
# nginx . . . . . . . yes
# ntpd . . . . . . . yes
-# nut . . . . . . . . no
+# nut . . . . . . . . yes
# perl . . . . . . . no (needs libperl)
# ping . . . . . . . yes
# powerdns . . . . . yes
@@ -60,7 +60,9 @@
# wireless . . . . . yes
# xmms . . . . . . . yes
%bcond_without dns
+%bcond_without ipmi
%bcond_without iptables
+%bcond_with multimeter
%bcond_without netlink
#http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=358637
@@ -72,7 +74,7 @@
Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD
Name: collectd
Version: 4.4.2
-Release: 2
+Release: 3
License: GPL v2
Group: Daemons
Source0: http://collectd.org/files/%{name}-%{version}.tar.gz
@@ -93,6 +95,7 @@
BuildRequires: libtool
BuildRequires: lm_sensors-devel
BuildRequires: mysql-devel
+BuildRequires: nut-devel
BuildRequires: perl-devel
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: rrdtool-devel
@@ -179,6 +182,15 @@
%description hddtemp
hddtemp plugin for collectd.
+%package ipmi
+Summary: ipmi-plugin for collectd
+Summary(pl_PL.UTF-8): Wtyczka ipmi dla collectd
+Group: Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description ipmi
+ipmi plugin for collectd.
+
%package mysql
Summary: mysql-plugin for collectd
Summary(pl_PL.UTF-8): Moduł mysql dla collectd.
@@ -286,12 +298,16 @@
--with-libstatgrab=/usr \
--with-lm-sensors=/usr \
--with-libmysql=/usr \
+ --%{?with_ipmi:en}%{?!with_ipmi:dis}able-ipmi \
+ --%{?with_multimeter:en}%{?!with_multimeter:dis}able-multimeter \
--%{?with_dns:en}%{?!with_dns:dis}able-dns \
--%{?with_iptables:en}%{?!with_iptables:dis}able-iptables \
--%{?with_netlink:en}%{?!with_netlink:dis}able-netlink
-%{__make} LDFLAGS="%{rpmldflags} -lstatgrab"
+%{__make} LDFLAGS="%{rpmldflags} -lstatgrab" \
+ BUILD_WITH_OPENIPMI_CFLAGS="-I/usr/include" \
+ BUILD_WITH_OPENIPMI_LIBS="-L/usr/lib64 -lOpenIPMIutils -lOpenIPMIpthread"
%install
rm -rf $RPM_BUILD_ROOT
@@ -369,11 +385,14 @@
%attr(755,root,root) %{_libdir}/%{name}/mbmon.so
%attr(755,root,root) %{_libdir}/%{name}/memcached.so
%attr(755,root,root) %{_libdir}/%{name}/memory.so
+%if %{with multimeter}
%attr(755,root,root) %{_libdir}/%{name}/multimeter.so
+%endif
%if %{with netlink}
%attr(755,root,root) %{_libdir}/%{name}/netlink.so
%endif
%attr(755,root,root) %{_libdir}/%{name}/network.so
+%attr(755,root,root) %{_libdir}/%{name}/nut.so
%attr(755,root,root) %{_libdir}/%{name}/nfs.so
%attr(755,root,root) %{_libdir}/%{name}/ntpd.so
#%attr(755,root,root) %{_libdir}/%{name}/perl.so
@@ -434,6 +453,12 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/hddtemp.so
+%if %{with ipmi}
+%files ipmi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/ipmi.so
+%endif
+
%files mysql
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/mysql.so
@@ -476,6 +501,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.32 2008/08/05 05:54:11 luzik
+- added nut and ipmi plugins
+- rel 3, STBR
+
Revision 1.31 2008/07/31 16:01:56 luzik
- rel.2 STBR
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/collectd.spec?r1=1.31&r2=1.32&f=u
More information about the pld-cvs-commit
mailing list