- more spec cleanups

[packages/collectd.git] / collectd.spec

diff --git a/collectd.spec b/collectd.spec
index ba2a637f960bccf047a718c844d7333b2647173f..8e307535901d5b1c5e3c234ac5f3c16bb2ea404a 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,21 +1,22 @@
 # TODO:
-# - mysql subpackage
 # - 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
 Summary:       Collects system information in RRD files
 Summary(pl.UTF-8):     Zbieranie informacji o systemie w plikach RRD
 Name:          collectd
-Version:       3.11.2
-Release:       0.2
+Version:       4.2.1
+Release:       0.1
 License:       GPL v2
 Group:         Daemons
 Source0:       http://collectd.org/files/%{name}-%{version}.tar.gz
-# Source0-md5: 40f4c3689c2c049497a8b1a47e01cc75
+# Source0-md5: 8f708005ce592f53566385118f6eef76
 Source1:       %{name}.conf
-Patch0:                %{name}-include.patch
 URL:           http://collectd.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -24,6 +25,7 @@ BuildRequires:        libstatgrab-devel >= 0.12
 BuildRequires: libpcap-devel
 BuildRequires: libtool
 BuildRequires: mysql-devel
+BuildRequires: perl-devel
 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: rrdtool-devel
 Requires(post,preun):  /sbin/chkconfig
@@ -50,9 +52,35 @@ 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 apache
+Summary:       apache-plugin for collectd
+Summary(pl_PL.UTF-8):  Wtyczka apache dla collectd
+Group:         Daemons
+Requires:      %{name} = %{version}-%{release}
+
+%description apache
+This plugin collectd data provided by Apache's `mod_status'.
+
+%description apache -l pl.UTF-8
+Wtyczka collectd zbierająca informacje udostępniane przez moduł
+'mod_status' Apacha.
+
+%package mysql
+Summary:       mysql-plugin for collectd
+Summary(pl_PL.UTF-8):  Moduł mysql dla collectd.
+Group:         Daemons
+Requires:      %{name} = %{version}-%{release}
+
+%description mysql
+MySQL querying plugin. This plugins provides data of issued commands,
+called handlers and database traffic.
+
+%description mysql -l pl.UTF-8
+Moduł odpytujący MySQL. Wtyczka udostępnia dane o wydawanych
+poleceniach, wywoływanych procedurach obsługi i ruchu bazodanowym.
+
 %prep
 %setup -q
-%patch -p1
 
 %build
 %{__libtoolize}
@@ -63,7 +91,7 @@ sekund i nie obciążać zbytnio systemu.
 %configure \
        --with-libstatgrab=/usr \
        --with-lm-sensors=/usr \
-       --with-libmysql=/usr \
+       --with-libmysql=/usr 
 %{__make}
 
 %install
@@ -94,35 +122,50 @@ fi
 %doc AUTHORS ChangeLog README TODO
 
 %attr(755,root,root) %{_sbindir}/collectd
+%attr(755,root,root) %{_bindir}/collectd-nagios
 %dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/apache.so
 %attr(755,root,root) %{_libdir}/%{name}/apcups.so
-%attr(755,root,root) %{_libdir}/%{name}/apple_sensors.so
+#%attr(755,root,root) %{_libdir}/%{name}/apple_sensors.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}/irq.so
 %attr(755,root,root) %{_libdir}/%{name}/load.so
+%attr(755,root,root) %{_libdir}/%{name}/logfile.so
 %attr(755,root,root) %{_libdir}/%{name}/mbmon.so
+%attr(755,root,root) %{_libdir}/%{name}/memcached.so
 %attr(755,root,root) %{_libdir}/%{name}/memory.so
 %attr(755,root,root) %{_libdir}/%{name}/multimeter.so
-%attr(755,root,root) %{_libdir}/%{name}/mysql.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}/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}/swap.so
-%attr(755,root,root) %{_libdir}/%{name}/tape.so
-%attr(755,root,root) %{_libdir}/%{name}/traffic.so
+%attr(755,root,root) %{_libdir}/%{name}/syslog.so
+#%attr(755,root,root) %{_libdir}/%{name}/tape.so
+%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}/users.so
 %attr(755,root,root) %{_libdir}/%{name}/vserver.so
 %attr(755,root,root) %{_libdir}/%{name}/wireless.so
+%{_libdir}/%{name}/types.db
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 
@@ -130,4 +173,18 @@ fi
 #%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 
 %{_mandir}/man1/collectd.1*
+%{_mandir}/man1/collectd-nagios.1*
 %{_mandir}/man5/collectd.conf.5*
+%{_mandir}/man5/collectd-email.5*
+%{_mandir}/man5/collectd-exec.5*
+%{_mandir}/man5/collectd-perl.5*
+%{_mandir}/man5/collectd-snmp.5*
+%{_mandir}/man5/collectd-unixsock.5*
+
+%files apache
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/apache.so
+
+%files mysql
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/mysql.so