rpms/collectd/F-9 collectd-4.3.3-include-collectd.d.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 collectd.spec, 1.4, 1.5 sources, 1.2, 1.3

[Alan Pevec (apevec)]

Author: apevec

Update of /cvs/pkgs/rpms/collectd/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5075

Modified Files:
	.cvsignore collectd.spec sources 
Added Files:
	collectd-4.3.3-include-collectd.d.patch 
Log Message:
* Thu Jun 12 2008 Alan Pevec <apevec at redhat.com> 4.3.3-1
- New upstream version 4.3.3.
- include /etc/collectd.d (bz#443942)
- cleanup subpackages, split dns plugin



collectd-4.3.3-include-collectd.d.patch:

--- NEW FILE collectd-4.3.3-include-collectd.d.patch ---
--- collectd-4.3.3/src/collectd.conf.in.orig	2008-04-23 14:29:16.000000000 +0200
+++ collectd-4.3.3/src/collectd.conf.in	2008-06-12 11:28:41.000000000 +0200
@@ -13,7 +13,6 @@
 #Interval     10
 #ReadThreads  5
 
- 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_BATTERY_TRUE at LoadPlugin battery
@@ -22,8 +21,6 @@
 @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
- at BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email
 @BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
 @BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
 @BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp
@@ -31,27 +28,20 @@
 @BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables
 @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_LOGFILE_TRUE at LoadPlugin logfile
 @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_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_SYSLOG_TRUE at LoadPlugin syslog
 @BUILD_PLUGIN_TAPE_TRUE at LoadPlugin tape
@@ -287,3 +277,4 @@
 #	UUIDFile "/etc/uuid"
 #</Plugin>
 
+Include "/etc/collectd.d"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Apr 2008 09:27:19 -0000	1.2
+++ .cvsignore	12 Jun 2008 09:36:49 -0000	1.3
@@ -1 +1 @@
-collectd-4.3.2.tar.bz2
+collectd-4.3.3.tar.bz2


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/collectd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- collectd.spec	10 Jun 2008 21:17:22 -0000	1.4
+++ collectd.spec	12 Jun 2008 09:36:49 -0000	1.5
@@ -1,12 +1,13 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
-Version: 4.3.2
-Release: 9%{?dist}
+Version: 4.3.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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: libvirt-devel, libxml2-devel
@@ -33,7 +34,15 @@
 Group:         System Environment/Daemons
 Requires:      collectd = %{version}, curl
 %description apache
-This plugin collectd data provided by Apache's 'mod_status'.
+This plugin collects data provided by Apache's 'mod_status'.
+
+
+%package dns
+Summary:       DNS traffic analysis module for collectd
+Group:         System Environment/Daemons
+Requires:      collectd = %{version}
+%description dns
+This plugin collects DNS traffic data.
 
 
 %package email
@@ -41,7 +50,7 @@
 Group:         System Environment/Daemons
 Requires:      collectd = %{version}, spamassassin
 %description email
-This plugin collectd data provided by spamassassin.
+This plugin collects data provided by spamassassin.
 
 
 %package mysql
@@ -64,7 +73,7 @@
 %package -n perl-Collectd
 Summary:       Perl bindings for collectd
 Group:         System Environment/Daemons
-Requires:      collectd = %{version}, curl
+Requires:      collectd = %{version}
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %description -n perl-Collectd
 This package contains Perl bindings and plugin for collectd.
@@ -73,7 +82,7 @@
 %package rrdtool
 Summary:       RRDTool module for collectd
 Group:         System Environment/Daemons
-Requires:      rrdtool
+Requires:      collectd = %{version}, rrdtool
 %description rrdtool
 This plugin for collectd provides rrdtool support.
 
@@ -98,13 +107,14 @@
 %package virt
 Summary:       Libvirt plugin for collectd
 Group:         System Environment/Daemons
-Requires:      collectd = %{version}, curl
+Requires:      collectd = %{version}, libvirt
 %description virt
 This plugin collects information from virtualized guests.
 
 
 %prep
 %setup -q
+%patch0 -p1
 
 sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
 
@@ -148,16 +158,25 @@
 find contrib -name '*.p[lm]' -exec mv {} perl-examples/ \;
 
 # Move config contribs
-mkdir -p $RPM_BUILD_ROOT/etc/collectd.d/
-cp contrib/redhat/apache.conf $RPM_BUILD_ROOT/etc/collectd.d/apache.conf
-cp contrib/redhat/email.conf $RPM_BUILD_ROOT/etc/collectd.d/email.conf
-cp contrib/redhat/sensors.conf $RPM_BUILD_ROOT/etc/collectd.d/sensors.conf
-cp contrib/redhat/mysql.conf $RPM_BUILD_ROOT/etc/collectd.d/mysql.conf
-cp contrib/redhat/nginx.conf $RPM_BUILD_ROOT/etc/collectd.d/nginx.conf
-cp contrib/redhat/snmp.conf $RPM_BUILD_ROOT/etc/collectd.d/snmp.conf
+mkdir -p %{buildroot}/etc/collectd.d/
+cp contrib/redhat/apache.conf %{buildroot}/etc/collectd.d/apache.conf
+cp contrib/redhat/email.conf %{buildroot}/etc/collectd.d/email.conf
+cp contrib/redhat/mysql.conf %{buildroot}/etc/collectd.d/mysql.conf
+cp contrib/redhat/nginx.conf %{buildroot}/etc/collectd.d/nginx.conf
+cp contrib/redhat/sensors.conf %{buildroot}/etc/collectd.d/sensors.conf
+cp contrib/redhat/snmp.conf %{buildroot}/etc/collectd.d/snmp.conf
+
+# configs for subpackaged plugins
+for p in dns libvirt perl rrdtool
+do
+%{__cat} > %{buildroot}/etc/collectd.d/$p.conf <<EOF
+LoadPlugin $p
+EOF
+done
+
 
 # *.la files shouldn't be distributed.
-rm -f $RPM_BUILD_ROOT/%{_libdir}/collectd/*.la
+rm -f %{buildroot}/%{_libdir}/collectd/*.la
 
 
 %post
@@ -184,6 +203,16 @@
 
 %config(noreplace) %{_sysconfdir}/collectd.conf
 %config(noreplace) %{_sysconfdir}/collectd.d/
+%exclude %{_sysconfdir}/collectd.d/apache.conf
+%exclude %{_sysconfdir}/collectd.d/dns.conf
+%exclude %{_sysconfdir}/collectd.d/email.conf
+%exclude %{_sysconfdir}/collectd.d/libvirt.conf
+%exclude %{_sysconfdir}/collectd.d/mysql.conf
+%exclude %{_sysconfdir}/collectd.d/nginx.conf
+%exclude %{_sysconfdir}/collectd.d/perl.conf
+%exclude %{_sysconfdir}/collectd.d/rrdtool.conf
+%exclude %{_sysconfdir}/collectd.d/sensors.conf
+%exclude %{_sysconfdir}/collectd.d/snmp.conf
 
 %{_initrddir}/collectd
 %{_bindir}/collectd-nagios
@@ -194,6 +223,7 @@
 %{_libdir}/collectd/*.so*
 %{_libdir}/collectd/types.db
 %exclude %{_libdir}/collectd/apache.so*
+%exclude %{_libdir}/collectd/dns.so*
 %exclude %{_libdir}/collectd/email.so*
 %exclude %{_libdir}/collectd/libvirt.so*
 %exclude %{_libdir}/collectd/mysql.so*
@@ -214,63 +244,68 @@
 
 
 %files apache
-%doc COPYING
 %{_libdir}/collectd/apache.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/apache.conf
 
 
+%files dns
+%{_libdir}/collectd/dns.so*
+%config(noreplace) %{_sysconfdir}/collectd.d/dns.conf
+
+
 %files email
-%doc COPYING
 %{_libdir}/collectd/email.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/email.conf
 %doc %{_mandir}/man5/collectd-email.5*
 
 
 %files mysql
-%doc COPYING
 %{_libdir}/collectd/mysql.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/mysql.conf
 
 
 %files nginx
-%doc COPYING
 %{_libdir}/collectd/nginx.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/nginx.conf
 
 
 %files -n perl-Collectd
-%doc COPYING perl-examples/*
+%doc perl-examples/*
 %{_libdir}/collectd/perl.so*
 %{perl_vendorlib}/Collectd.pm
 %{perl_vendorlib}/Collectd/
+%config(noreplace) %{_sysconfdir}/collectd.d/perl.conf
 %doc %{_mandir}/man5/collectd-perl.5*
 %doc %{_mandir}/man3/Collectd::Unixsock.3pm*
 
 
 %files rrdtool
-%doc COPYING
 %{_libdir}/collectd/rrdtool.so*
+%config(noreplace) %{_sysconfdir}/collectd.d/rrdtool.conf
 
 
 %files sensors
-%doc COPYING
 %{_libdir}/collectd/sensors.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/sensors.conf
 
 
 %files snmp
-%doc COPYING
 %{_libdir}/collectd/snmp.so*
 %config(noreplace) %{_sysconfdir}/collectd.d/snmp.conf
 %doc %{_mandir}/man5/collectd-snmp.5*
 
 
 %files virt
-%doc COPYING
 %{_libdir}/collectd/libvirt.so*
+%config(noreplace) %{_sysconfdir}/collectd.d/libvirt.conf
 
 
 %changelog
+* Thu Jun 12 2008 Alan Pevec <apevec at redhat.com> 4.3.3-1
+- New upstream version 4.3.3.
+- include /etc/collectd.d (bz#443942)
+- cleanup subpackages, split dns plugin
+
 * Tue Jun 10 2008 Chris Lalancette <clalance at redhat.com> - 4.3.2-9
 - Split rrdtool into a subpackage.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Apr 2008 09:27:19 -0000	1.2
+++ sources	12 Jun 2008 09:36:49 -0000	1.3
@@ -1 +1 @@
-60d79699cd71b85b8c91f60608d92c5a  collectd-4.3.2.tar.bz2
+4ae6686908503a72292fbd2a46bba448  collectd-4.3.3.tar.bz2