Author: blues Date: Thu Oct 30 17:39:05 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - more plugin configuration into separate configs
---- Files affected: SPECS: collectd.spec (1.42 -> 1.43) ---- Diffs: ================================================================ Index: SPECS/collectd.spec diff -u SPECS/collectd.spec:1.42 SPECS/collectd.spec:1.43 --- SPECS/collectd.spec:1.42 Thu Oct 30 18:11:54 2008 +++ SPECS/collectd.spec Thu Oct 30 18:38:59 2008 @@ -76,7 +76,7 @@ Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD Name: collectd Version: 4.5.0 -Release: 5.1 +Release: 5.2 License: GPL v2 Group: Daemons Source0: http://collectd.org/files/%{name}-%{version}.tar.gz @@ -102,6 +102,14 @@ Source25: %{name}-snmp.conf Source26: %{name}-uuid.conf Source27: %{name}-xmms.conf +Source28: %{name}-tcpconns.conf +Source29: %{name}-teamspeak2.conf +Source30: %{name}-thermal.conf +Source31: %{name}-unixsock.conf +Source32: %{name}-users.conf +Source33: %{name}-vmem.conf +Source34: %{name}-vserver.conf +Source35: %{name}-wireless.conf URL: http://collectd.org/ BuildRequires: OpenIPMI-devel BuildRequires: autoconf @@ -414,6 +422,14 @@ install %{SOURCE25} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/snmp.conf install %{SOURCE26} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/uuid.conf install %{SOURCE27} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/xmms.conf +install %{SOURCE28} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/tcpconns.conf +install %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/teamspeak2.conf +install %{SOURCE30} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/thermal.conf +install %{SOURCE31} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/unixsock.conf +install %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/users.conf +install %{SOURCE33} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/vmem.conf +install %{SOURCE34} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/vserver.conf +install %{SOURCE35} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/wireless.conf # Cleanups: rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la @@ -446,10 +462,20 @@ %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog README TODO contrib - +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf +%dir %{_sysconfdir}/%{name}.d +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/tcpconns.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/teamspeak2.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/thermal.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/unixsock.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/users.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/vmem.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/vserver.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/wireless.conf %attr(755,root,root) %{_sbindir}/collectd %attr(755,root,root) %{_sbindir}/collectdmon %attr(755,root,root) %{_bindir}/collectd-nagios + %dir %{_libdir}/%{name} %attr(755,root,root) %{_libdir}/%{name}/apcups.so #%attr(755,root,root) %{_libdir}/%{name}/apple_sensors.so @@ -492,8 +518,8 @@ %attr(755,root,root) %{_libdir}/%{name}/syslog.so %attr(755,root,root) %{_libdir}/%{name}/tail.so #%attr(755,root,root) %{_libdir}/%{name}/tape.so -%attr(755,root,root) %{_libdir}/%{name}/teamspeak2.so %attr(755,root,root) %{_libdir}/%{name}/tcpconns.so +%attr(755,root,root) %{_libdir}/%{name}/teamspeak2.so %attr(755,root,root) %{_libdir}/%{name}/thermal.so #%attr(755,root,root) %{_libdir}/%{name}/traffic.so %attr(755,root,root) %{_libdir}/%{name}/unixsock.so @@ -503,9 +529,6 @@ %attr(755,root,root) %{_libdir}/%{name}/wireless.so %{_libdir}/%{name}/types.db -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf -%dir %{_sysconfdir}/%{name}.d - %attr(754,root,root) /etc/rc.d/init.d/%{name} %{_mandir}/man1/collectd.1* @@ -630,6 +653,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.43 2008/10/30 17:38:59 blues +- more plugin configuration into separate configs + Revision 1.42 2008/10/30 17:11:54 blues - put modules configs into separate files and start using collectd.d dir ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/collectd.spec?r1=1.42&r2=1.43&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit