X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcollectd.git;a=blobdiff_plain;f=collectd.spec;h=34683d28bd17343c5c4ee6ddf741a0dbf4a313ed;hp=4eb386dd6bd08a1b976cf3e6ff8817e11a088195;hb=8bf13ddb07207c568a0593588c030d2aaf455377;hpb=e105712e7f9ad70942dd7cf9e8f386ebaf811819

diff --git a/collectd.spec b/collectd.spec
index 4eb386d..34683d2 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,17 +1,71 @@
 # TODO:
 # - lm_sensors subpackage
-# - perl (plugin and bindings) subpackage
-# - hddtemp subpackage
 # - initscripts for local/client/server mode (subpackage ?)
 # - collection CGI script
 # - package contrib scripts as %doc
-# - build nut, iptables and other plugins
-# - fix building perl plugin
+# - put every plugin into subpackages
+# - Current plugins status:
+#    apache  . . . . . . yes
+#    apcups  . . . . . . yes
+#    apple_sensors . . . no
+#    ascent  . . . . . . yes
+#    battery . . . . . . yes
+#    cpu . . . . . . . . yes
+#    cpufreq . . . . . . yes
+#    csv . . . . . . . . yes
+#    df  . . . . . . . . yes
+#    disk  . . . . . . . yes
+#    dns . . . . . . . . yes
+#    email . . . . . . . yes
+#    entropy . . . . . . yes
+#    exec  . . . . . . . yes
+#    hddtemp . . . . . . yes
+#    interface . . . . . yes
+#    iptables  . . . . . yes
+#    ipmi  . . . . . . . no
+#    ipvs  . . . . . . . no (ip_vs.h not found)
+#    irq . . . . . . . . yes
+#    libvirt . . . . . . no
+#    load  . . . . . . . yes
+#    logfile . . . . . . yes
+#    mbmon . . . . . . . yes
+#    memcached . . . . . yes
+#    memory  . . . . . . yes
+#    multimeter  . . . . yes
+#    mysql . . . . . . . yes
+#    netlink . . . . . . yes
+#    network . . . . . . yes
+#    nfs . . . . . . . . yes
+#    nginx . . . . . . . yes
+#    ntpd  . . . . . . . yes
+#    nut . . . . . . . . no
+#    perl  . . . . . . . no (needs libperl)
+#    ping  . . . . . . . yes
+#    powerdns  . . . . . yes
+#    processes . . . . . yes
+#    rrdtool . . . . . . yes
+#    sensors . . . . . . yes
+#    serial  . . . . . . yes
+#    snmp  . . . . . . . yes
+#    swap  . . . . . . . yes
+#    syslog  . . . . . . yes
+#    tail  . . . . . . . yes
+#    tape  . . . . . . . no
+#    tcpconns  . . . . . yes
+#    teamspeak2  . . . . yes
+#    unixsock  . . . . . yes
+#    users . . . . . . . yes
+#    uuid  . . . . . . . yes
+#    vmem  . . . . . . . yes
+#    vserver . . . . . . yes
+#    wireless  . . . . . yes
+#    xmms  . . . . . . . yes
+
 Summary:	Collects system information in RRD files
 Summary(pl.UTF-8):	Zbieranie informacji o systemie w plikach RRD
 Name:		collectd
 Version:	4.4.0
-Release:	0.1
+Release:	0.2
 License:	GPL v2
 Group:		Daemons
 Source0:	http://collectd.org/files/%{name}-%{version}.tar.gz
@@ -22,14 +76,18 @@ BuildRequires:	OpenIPMI-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	curl-devel
+BuildRequires:	iptables-devel
 BuildRequires:	libnetlink-devel
-BuildRequires:	libstatgrab-devel >= 0.12
+# External package needed (http://verplant.org/liboping/)
+#BuildRequires:	liboping-devel
 BuildRequires:	libpcap-devel
+BuildRequires:	libstatgrab-devel >= 0.12
 BuildRequires:	libtool
 BuildRequires:	mysql-devel
 BuildRequires:	perl-devel
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	rrdtool-devel
+BuildRequires:	xmms-devel
 Requires(post,preun):	/sbin/chkconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -54,6 +112,15 @@ urychamiania ciężkiego interpretera za każdym razem, kiedy powinny być
 zapisane nowe wartości. Dzięki temu collect może mieć rozdzielczość 10
 sekund i nie obciążać zbytnio systemu.
 
+%package ascent
+Summary:	ascent-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka ascent dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description ascent
+ascent plugin for collectd.
+
 %package apache
 Summary:	apache-plugin for collectd
 Summary(pl_PL.UTF-8):	Wtyczka apache dla collectd
@@ -67,6 +134,24 @@ This plugin collectd data provided by Apache's `mod_status'.
 Wtyczka collectd zbierająca informacje udostępniane przez moduł
 'mod_status' Apacha.
 
+%package dns
+Summary:	dns-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka dns dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description dns
+dns plugin for collectd.
+
+%package hddtemp
+Summary:	hddtemp-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka hddtemp dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description hddtemp
+hddtemp plugin for collectd.
+
 %package mysql
 Summary:	mysql-plugin for collectd
 Summary(pl_PL.UTF-8):	Moduł mysql dla collectd.
@@ -81,6 +166,62 @@ called handlers and database traffic.
 Moduł odpytujący MySQL. Wtyczka udostępnia dane o wydawanych
 poleceniach, wywoływanych procedurach obsługi i ruchu bazodanowym.
 
+%package nginx
+Summary:	nginx-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka nginx dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description nginx
+nginx plugin for collectd.
+
+%package rrdtool
+Summary:	rrdtool-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka rrdtool dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	rrdtool
+
+%description rrdtool
+RRDTOOL plugin for collectd.
+
+%package sensors
+Summary:	sensors-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka sensors dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description sensors
+This plugin collectd data provided by hardware sensors.
+
+%package snmp
+Summary:	snmp-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka snmp dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description snmp
+snmp plugin for collectd.
+
+%package uuid
+Summary:	uuid-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka uuid dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description uuid
+This plugin collectd UUID data.
+
+%package xmms
+Summary:	xmms-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka xmms dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	xmms-libs
+
+%description xmms
+This plugin collectd data provided by XMMS.
+
 %prep
 %setup -q
 
@@ -132,18 +273,15 @@ fi
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/apcups.so
 #%attr(755,root,root) %{_libdir}/%{name}/apple_sensors.so
-%attr(755,root,root) %{_libdir}/%{name}/ascent.so
 %attr(755,root,root) %{_libdir}/%{name}/battery.so
 %attr(755,root,root) %{_libdir}/%{name}/cpufreq.so
 %attr(755,root,root) %{_libdir}/%{name}/cpu.so
 %attr(755,root,root) %{_libdir}/%{name}/csv.so
 %attr(755,root,root) %{_libdir}/%{name}/df.so
 %attr(755,root,root) %{_libdir}/%{name}/disk.so
-%attr(755,root,root) %{_libdir}/%{name}/dns.so
 %attr(755,root,root) %{_libdir}/%{name}/email.so
 %attr(755,root,root) %{_libdir}/%{name}/entropy.so
 %attr(755,root,root) %{_libdir}/%{name}/exec.so
-%attr(755,root,root) %{_libdir}/%{name}/hddtemp.so
 %attr(755,root,root) %{_libdir}/%{name}/interface.so
 %attr(755,root,root) %{_libdir}/%{name}/iptables.so
 %attr(755,root,root) %{_libdir}/%{name}/irq.so
@@ -156,17 +294,12 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/netlink.so
 %attr(755,root,root) %{_libdir}/%{name}/network.so
 %attr(755,root,root) %{_libdir}/%{name}/nfs.so
-%attr(755,root,root) %{_libdir}/%{name}/nginx.so
 %attr(755,root,root) %{_libdir}/%{name}/ntpd.so
 #%attr(755,root,root) %{_libdir}/%{name}/perl.so
 %attr(755,root,root) %{_libdir}/%{name}/ping.so
 %attr(755,root,root) %{_libdir}/%{name}/powerdns.so
 %attr(755,root,root) %{_libdir}/%{name}/processes.so
-%attr(755,root,root) %{_libdir}/%{name}/rrdtool.so
-#%attr(755,root,root) %{_libdir}/%{name}/sensors.so
-%attr(755,root,root) %{_libdir}/%{name}/sensors.so
 %attr(755,root,root) %{_libdir}/%{name}/serial.so
-%attr(755,root,root) %{_libdir}/%{name}/snmp.so
 %attr(755,root,root) %{_libdir}/%{name}/swap.so
 %attr(755,root,root) %{_libdir}/%{name}/syslog.so
 %attr(755,root,root) %{_libdir}/%{name}/tail.so
@@ -175,12 +308,10 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/tcpconns.so
 #%attr(755,root,root) %{_libdir}/%{name}/traffic.so
 %attr(755,root,root) %{_libdir}/%{name}/unixsock.so
-%attr(755,root,root) %{_libdir}/%{name}/uuid.so
 %attr(755,root,root) %{_libdir}/%{name}/users.so
 %attr(755,root,root) %{_libdir}/%{name}/vmem.so
 %attr(755,root,root) %{_libdir}/%{name}/vserver.so
 %attr(755,root,root) %{_libdir}/%{name}/wireless.so
-%attr(755,root,root) %{_libdir}/%{name}/xmms.so
 %{_libdir}/%{name}/types.db
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
@@ -201,11 +332,47 @@ fi
 %{_var}/log/collectd.log
 %dir %{_var}/lib/%{name}
 
+########## PLUGINS:
+%files ascent
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/ascent.so
 
 %files apache
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/apache.so
 
+%files dns
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/dns.so
+
+%files hddtemp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/hddtemp.so
+
 %files mysql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/mysql.so
+
+%files nginx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/nginx.so
+
+%files rrdtool
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/rrdtool.so
+
+%files sensors
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/sensors.so
+
+%files snmp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/snmp.so
+
+%files uuid
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/uuid.so
+
+%files xmms
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/xmms.so