X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Ffedora%2Fcollectd.spec;h=a35923c0bd646e37164ded1552cae28104e2f764;hb=96c7236a210a3e85116c053ac79fe10c38a3a9d4;hp=d58551220ab69bc043878f377e3bd1c5cac4281f;hpb=01d046d682a69287d41692729c0c70a92fdcb8d3;p=collectd.git diff --git a/contrib/fedora/collectd.spec b/contrib/fedora/collectd.spec index d5855122..a35923c0 100644 --- a/contrib/fedora/collectd.spec +++ b/contrib/fedora/collectd.spec @@ -1,13 +1,17 @@ Summary: Statistics collection daemon for filling RRD files. Name: collectd -Version: 4.0.5 -Release: 0.fc0 +Version: 4.2.0 +Release: 1.fc6 Source: http://collectd.org/files/%{name}-%{version}.tar.gz License: GPL Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: lm_sensors-devel, mysql-devel, rrdtool-devel +BuildPrereq: lm_sensors-devel +BuildPrereq: mysql-devel +BuildPrereq: rrdtool-devel +BuildPrereq: net-snmp-devel Requires: rrdtool +Requires: perl-Regexp-Common Packager: Florian octo Forster Vendor: Florian octo Forster @@ -63,9 +67,8 @@ mkdir -p $RPM_BUILD_ROOT/var/www/cgi-bin cp src/collectd.conf $RPM_BUILD_ROOT/etc/collectd.conf cp contrib/fedora/init.d-collectd $RPM_BUILD_ROOT/etc/rc.d/init.d/collectd cp contrib/collection.cgi $RPM_BUILD_ROOT/var/www/cgi-bin +cp contrib/collection.conf $RPM_BUILD_ROOT/etc/collection.conf mkdir -p $RPM_BUILD_ROOT/var/lib/collectd -#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a -#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -75,14 +78,24 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig collectd on %preun -/sbin/chkconfig collectd off -/etc/init.d/collectd stop -/sbin/chkconfig --del collectd +if [ "$1" = 0 ]; then + /sbin/chkconfig collectd off + /etc/init.d/collectd stop + /sbin/chkconfig --del collectd +fi +exit 0 + +%postun +if [ "$1" -ge 1 ]; then + /etc/init.d/collectd restart +fi +exit 0 %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README -%config /etc/collectd.conf +%attr(0644,root,root) %config(noreplace) /etc/collectd.conf +%attr(0644,root,root) %config(noreplace) /etc/collection.conf %attr(0755,root,root) /etc/rc.d/init.d/collectd %attr(0755,root,root) /var/www/cgi-bin/collection.cgi %attr(0755,root,root) %{_sbindir}/collectd @@ -90,15 +103,25 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_mandir}/man1/* %attr(0644,root,root) %{_mandir}/man5/* +%attr(0644,root,root) /usr/lib/perl5/5.8.8/i386-linux-thread-multi/perllocal.pod +%attr(0644,root,root) /usr/lib/perl5/site_perl/5.8.8/Collectd.pm +%attr(0644,root,root) /usr/lib/perl5/site_perl/5.8.8/Collectd/Unixsock.pm +%attr(0644,root,root) /usr/lib/perl5/site_perl/5.8.8/i386-linux-thread-multi/auto/Collectd/.packlist +%attr(0644,root,root) %{_mandir}/man3/Collectd::Unixsock.3pm.gz + %attr(0644,root,root) %{_libdir}/%{name}/apcups.so* %attr(0644,root,root) %{_libdir}/%{name}/apcups.la -%attr(0644,root,root) %{_libdir}/%{name}/apple_sensors.so* -%attr(0644,root,root) %{_libdir}/%{name}/apple_sensors.la +# FIXME!!! +#%attr(0644,root,root) %{_libdir}/%{name}/apple_sensors.so* +#%attr(0644,root,root) %{_libdir}/%{name}/apple_sensors.la %attr(0644,root,root) %{_libdir}/%{name}/battery.so* %attr(0644,root,root) %{_libdir}/%{name}/battery.la +%attr(0644,root,root) %{_libdir}/%{name}/conntrack.so* +%attr(0644,root,root) %{_libdir}/%{name}/conntrack.la + %attr(0644,root,root) %{_libdir}/%{name}/cpufreq.so* %attr(0644,root,root) %{_libdir}/%{name}/cpufreq.la @@ -141,9 +164,12 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/%{name}/logfile.so* %attr(0644,root,root) %{_libdir}/%{name}/logfile.la -%attr(0644,root,root) %{_libdir}/%{name}/mbmon.so +%attr(0644,root,root) %{_libdir}/%{name}/mbmon.so* %attr(0644,root,root) %{_libdir}/%{name}/mbmon.la +%attr(0644,root,root) %{_libdir}/%{name}/memcached.so* +%attr(0644,root,root) %{_libdir}/%{name}/memcached.la + %attr(0644,root,root) %{_libdir}/%{name}/memory.so* %attr(0644,root,root) %{_libdir}/%{name}/memory.la @@ -156,11 +182,15 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/%{name}/nfs.so* %attr(0644,root,root) %{_libdir}/%{name}/nfs.la +%attr(0644,root,root) %{_libdir}/%{name}/nginx.so* +%attr(0644,root,root) %{_libdir}/%{name}/nginx.la + %attr(0644,root,root) %{_libdir}/%{name}/ntpd.so* %attr(0644,root,root) %{_libdir}/%{name}/ntpd.la -%attr(0644,root,root) %{_libdir}/%{name}/nut.so* -%attr(0644,root,root) %{_libdir}/%{name}/nut.la +# FIXME!!! +#%attr(0644,root,root) %{_libdir}/%{name}/nut.so* +#%attr(0644,root,root) %{_libdir}/%{name}/nut.la %attr(0644,root,root) %{_libdir}/%{name}/perl.so* %attr(0644,root,root) %{_libdir}/%{name}/perl.la @@ -180,11 +210,18 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/%{name}/swap.so* %attr(0644,root,root) %{_libdir}/%{name}/swap.la +%attr(0644,root,root) %{_libdir}/%{name}/snmp.so* +%attr(0644,root,root) %{_libdir}/%{name}/snmp.la + %attr(0644,root,root) %{_libdir}/%{name}/syslog.so* %attr(0644,root,root) %{_libdir}/%{name}/syslog.la -%attr(0644,root,root) %{_libdir}/%{name}/tape.so* -%attr(0644,root,root) %{_libdir}/%{name}/tape.la +# FIXME!!! +#%attr(0644,root,root) %{_libdir}/%{name}/tape.so* +#%attr(0644,root,root) %{_libdir}/%{name}/tape.la + +%attr(0644,root,root) %{_libdir}/%{name}/tcpconns.so* +%attr(0644,root,root) %{_libdir}/%{name}/tcpconns.la %attr(0644,root,root) %{_libdir}/%{name}/unixsock.so* %attr(0644,root,root) %{_libdir}/%{name}/unixsock.la @@ -198,7 +235,7 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/%{name}/wireless.so* %attr(0644,root,root) %{_libdir}/%{name}/wireless.la -%attr(0644,root,root) %{_libdir}/%{name}/types.db +%attr(0644,root,root) %{_datadir}/%{name}/types.db %dir /var/lib/collectd @@ -219,8 +256,15 @@ rm -rf $RPM_BUILD_ROOT %attr(0644,root,root) %{_libdir}/%{name}/sensors.la %changelog +* Wed Oct 31 2007 Iain Lea 4.2.0 +- New major release +- Changes to support 4.2.0 (ie. contrib/collection.conf) + +* Mon Aug 06 2007 Kjell Randa 4.0.6 +- New upstream version + * Wed Jul 25 2007 Kjell Randa 4.0.5 -- New major releas +- New major release - Changes to support 4.0.5 * Wed Jan 11 2007 Iain Lea 3.11.0-0