rpms/collectd/F-9 collectd-4.4.3-include-collectd.d.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 collectd.spec, 1.7, 1.8 sources, 1.3, 1.4 collectd-4.3.3-include-collectd.d.patch, 1.1, NONE
Alan Pevec
apevec at fedoraproject.org
Tue Sep 16 13:14:50 UTC 2008
Author: apevec
Update of /cvs/pkgs/rpms/collectd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15689
Modified Files:
.cvsignore collectd.spec sources
Added Files:
collectd-4.4.3-include-collectd.d.patch
Removed Files:
collectd-4.3.3-include-collectd.d.patch
Log Message:
* Tue Sep 16 2008 Alan Pevec <apevec at redhat.com> 4.4.3-1
- Switch F-9 to 4.4.x stable branch, new upstream bugfix release 4.4.3
http://collectd.org/news.shtml#news57
collectd-4.4.3-include-collectd.d.patch:
--- NEW FILE collectd-4.4.3-include-collectd.d.patch ---
--- collectd-4.4.3/src/collectd.conf.in.orig 2008-09-04 09:59:01.000000000 +0200
+++ collectd-4.4.3/src/collectd.conf.in 2008-09-16 14:46:43.000000000 +0200
@@ -26,7 +26,6 @@
# LogLevel info
#</Plugin>
- at BUILD_PLUGIN_APACHE_TRUE@LoadPlugin apache
@BUILD_PLUGIN_APCUPS_TRUE at LoadPlugin apcups
@BUILD_PLUGIN_APPLE_SENSORS_TRUE at LoadPlugin apple_sensors
@BUILD_PLUGIN_ASCENT_TRUE at LoadPlugin ascent
@@ -36,37 +35,28 @@
@BUILD_PLUGIN_CSV_TRUE at LoadPlugin csv
@BUILD_PLUGIN_DF_TRUE at LoadPlugin df
@BUILD_PLUGIN_DISK_TRUE at LoadPlugin disk
- at BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns
@BUILD_PLUGIN_EMAIL_TRUE at LoadPlugin email
@BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
@BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
@BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp
@BUILD_PLUGIN_INTERFACE_TRUE at LoadPlugin interface
@BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables
- at BUILD_PLUGIN_IPMI_TRUE@LoadPlugin ipmi
@BUILD_PLUGIN_IPVS_TRUE at LoadPlugin ipvs
@BUILD_PLUGIN_IRQ_TRUE at LoadPlugin irq
- at BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt
@BUILD_PLUGIN_LOAD_TRUE at LoadPlugin load
@BUILD_PLUGIN_MBMON_TRUE at LoadPlugin mbmon
@BUILD_PLUGIN_MEMCACHED_TRUE at LoadPlugin memcached
@BUILD_PLUGIN_MEMORY_TRUE at LoadPlugin memory
@BUILD_PLUGIN_MULTIMETER_TRUE at LoadPlugin multimeter
- at BUILD_PLUGIN_MYSQL_TRUE@LoadPlugin mysql
@BUILD_PLUGIN_NETLINK_TRUE at LoadPlugin netlink
@BUILD_PLUGIN_NETWORK_TRUE at LoadPlugin network
@BUILD_PLUGIN_NFS_TRUE at LoadPlugin nfs
- at BUILD_PLUGIN_NGINX_TRUE@LoadPlugin nginx
@BUILD_PLUGIN_NTPD_TRUE at LoadPlugin ntpd
@BUILD_PLUGIN_NUT_TRUE at LoadPlugin nut
- at BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl
@BUILD_PLUGIN_PING_TRUE at LoadPlugin ping
@BUILD_PLUGIN_POWERDNS_TRUE at LoadPlugin powerdns
@BUILD_PLUGIN_PROCESSES_TRUE at LoadPlugin processes
- at BUILD_PLUGIN_RRDTOOL_TRUE@LoadPlugin rrdtool
- at BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors
@BUILD_PLUGIN_SERIAL_TRUE at LoadPlugin serial
- at BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
@BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
@BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
@BUILD_PLUGIN_TAPE_TRUE at LoadPlugin tape
@@ -348,3 +338,4 @@
# Verbose false
#</Plugin>
+Include "/etc/collectd.d"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 12 Jun 2008 09:36:49 -0000 1.3
+++ .cvsignore 16 Sep 2008 13:14:20 -0000 1.4
@@ -1 +1 @@
-collectd-4.3.3.tar.bz2
+collectd-4.4.3.tar.bz2
Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/collectd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- collectd.spec 1 Jul 2008 09:36:48 -0000 1.7
+++ collectd.spec 16 Sep 2008 13:14:20 -0000 1.8
@@ -1,25 +1,30 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
-Version: 4.3.3
-Release: 3%{?dist}
+Version: 4.4.3
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://collectd.org/
Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
-Patch0: %{name}-4.3.3-include-collectd.d.patch
+Patch0: %{name}-%{version}-include-collectd.d.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: libvirt-devel, libxml2-devel
BuildRequires: rrdtool-devel
BuildRequires: lm_sensors-devel
BuildRequires: curl-devel
+%if 0%{?fedora} >= 8
BuildRequires: perl-libs, perl-devel
-BuildRequires: perl-ExtUtils-MakeMaker
-BuildRequires: perl-ExtUtils-Embed
+%else
+BuildRequires: perl
+%endif
+BuildRequires: perl(ExtUtils::MakeMaker)
+BuildRequires: perl(ExtUtils::Embed)
BuildRequires: net-snmp-devel
BuildRequires: libpcap-devel
BuildRequires: mysql-devel
+BuildRequires: OpenIPMI-devel
%description
collectd is a small daemon written in C for performance. It reads various
@@ -53,6 +58,14 @@
This plugin collects data provided by spamassassin.
+%package ipmi
+Summary: IPMI module for collectd
+Group: System Environment/Daemons
+Requires: collectd = %{version}-%{release}, OpenIPMI
+%description ipmi
+This plugin for collectd provides IPMI support.
+
+
%package mysql
Summary: MySQL module for collectd
Group: System Environment/Daemons
@@ -121,6 +134,8 @@
%build
%configure \
+ --without-libiptc \
+ --disable-ascent \
--disable-static \
--enable-mysql \
--enable-sensors \
@@ -128,6 +143,7 @@
--enable-apache \
--enable-perl \
--enable-unixsock \
+ --enable-ipmi \
--with-perl-bindings=INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}
@@ -167,7 +183,7 @@
cp contrib/redhat/snmp.conf %{buildroot}/etc/collectd.d/snmp.conf
# configs for subpackaged plugins
-for p in dns libvirt perl rrdtool
+for p in dns ipmi libvirt perl rrdtool
do
%{__cat} > %{buildroot}/etc/collectd.d/$p.conf <<EOF
LoadPlugin $p
@@ -206,6 +222,7 @@
%exclude %{_sysconfdir}/collectd.d/apache.conf
%exclude %{_sysconfdir}/collectd.d/dns.conf
%exclude %{_sysconfdir}/collectd.d/email.conf
+%exclude %{_sysconfdir}/collectd.d/ipmi.conf
%exclude %{_sysconfdir}/collectd.d/libvirt.conf
%exclude %{_sysconfdir}/collectd.d/mysql.conf
%exclude %{_sysconfdir}/collectd.d/nginx.conf
@@ -225,6 +242,7 @@
%exclude %{_libdir}/collectd/apache.so*
%exclude %{_libdir}/collectd/dns.so*
%exclude %{_libdir}/collectd/email.so*
+%exclude %{_libdir}/collectd/ipmi.so*
%exclude %{_libdir}/collectd/libvirt.so*
%exclude %{_libdir}/collectd/mysql.so*
%exclude %{_libdir}/collectd/nginx.so*
@@ -244,32 +262,44 @@
%files apache
+%defattr(-, root, root, -)
%{_libdir}/collectd/apache.so*
%config(noreplace) %{_sysconfdir}/collectd.d/apache.conf
%files dns
+%defattr(-, root, root, -)
%{_libdir}/collectd/dns.so*
%config(noreplace) %{_sysconfdir}/collectd.d/dns.conf
%files email
+%defattr(-, root, root, -)
%{_libdir}/collectd/email.so*
%config(noreplace) %{_sysconfdir}/collectd.d/email.conf
%doc %{_mandir}/man5/collectd-email.5*
+%files ipmi
+%defattr(-, root, root, -)
+%{_libdir}/collectd/ipmi.so*
+%config(noreplace) %{_sysconfdir}/collectd.d/ipmi.conf
+
+
%files mysql
+%defattr(-, root, root, -)
%{_libdir}/collectd/mysql.so*
%config(noreplace) %{_sysconfdir}/collectd.d/mysql.conf
%files nginx
+%defattr(-, root, root, -)
%{_libdir}/collectd/nginx.so*
%config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf
%files -n perl-Collectd
+%defattr(-, root, root, -)
%doc perl-examples/*
%{_libdir}/collectd/perl.so*
%{perl_vendorlib}/Collectd.pm
@@ -280,27 +310,35 @@
%files rrdtool
+%defattr(-, root, root, -)
%{_libdir}/collectd/rrdtool.so*
%config(noreplace) %{_sysconfdir}/collectd.d/rrdtool.conf
%files sensors
+%defattr(-, root, root, -)
%{_libdir}/collectd/sensors.so*
%config(noreplace) %{_sysconfdir}/collectd.d/sensors.conf
%files snmp
+%defattr(-, root, root, -)
%{_libdir}/collectd/snmp.so*
%config(noreplace) %{_sysconfdir}/collectd.d/snmp.conf
%doc %{_mandir}/man5/collectd-snmp.5*
%files virt
+%defattr(-, root, root, -)
%{_libdir}/collectd/libvirt.so*
%config(noreplace) %{_sysconfdir}/collectd.d/libvirt.conf
%changelog
+* Tue Sep 16 2008 Alan Pevec <apevec at redhat.com> 4.4.3-1
+- Switch F-9 to 4.4.x stable branch, new upstream bugfix release 4.4.3
+ http://collectd.org/news.shtml#news57
+
* Tue Jul 01 2008 Alan Pevec <apevec at redhat.com> 4.3.3-3
- rebuild for rrdtool update
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 12 Jun 2008 09:36:49 -0000 1.3
+++ sources 16 Sep 2008 13:14:20 -0000 1.4
@@ -1 +1 @@
-4ae6686908503a72292fbd2a46bba448 collectd-4.3.3.tar.bz2
+309b7a0b9b128a1575308773e1c43d9f collectd-4.4.3.tar.bz2
--- collectd-4.3.3-include-collectd.d.patch DELETED ---
More information about the fedora-extras-commits
mailing list