rpms/collectd/F-9 collectd-4.5.1-include-collectd.d.patch, 1.1, 1.2 collectd.spec, 1.12, 1.13

[Alan Pevec]

Author: apevec

Update of /cvs/pkgs/rpms/collectd/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13384

Modified Files:
	collectd-4.5.1-include-collectd.d.patch collectd.spec 
Log Message:
* Sun Dec 07 2008 Alan Pevec <apevec at redhat.com> 4.5.1-2.1
- fix subpackages, bz# 475093


collectd-4.5.1-include-collectd.d.patch:

Index: collectd-4.5.1-include-collectd.d.patch
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/collectd-4.5.1-include-collectd.d.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- collectd-4.5.1-include-collectd.d.patch	30 Nov 2008 13:50:13 -0000	1.1
+++ collectd-4.5.1-include-collectd.d.patch	7 Dec 2008 20:56:19 -0000	1.2
@@ -8,15 +8,15 @@
  @BUILD_PLUGIN_APCUPS_TRUE at LoadPlugin apcups
  @BUILD_PLUGIN_APPLE_SENSORS_TRUE at LoadPlugin apple_sensors
  @BUILD_PLUGIN_ASCENT_TRUE at LoadPlugin ascent
-@@ -36,7 +35,6 @@
+@@ -36,42 +35,30 @@
  @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
+- at BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email
  @BUILD_PLUGIN_ENTROPY_TRUE at LoadPlugin entropy
  @BUILD_PLUGIN_EXEC_TRUE at LoadPlugin exec
-@@ -44,34 +42,24 @@
+ @BUILD_PLUGIN_FILECOUNT_TRUE at LoadPlugin filecount
  @BUILD_PLUGIN_HDDTEMP_TRUE at LoadPlugin hddtemp
  @BUILD_PLUGIN_INTERFACE_TRUE at LoadPlugin interface
  @BUILD_PLUGIN_IPTABLES_TRUE at LoadPlugin iptables
@@ -51,7 +51,7 @@
  @BUILD_PLUGIN_SWAP_TRUE at LoadPlugin swap
  @BUILD_PLUGIN_TAIL_TRUE at LoadPlugin tail
  @BUILD_PLUGIN_TAPE_TRUE at LoadPlugin tape
-@@ -423,3 +411,4 @@
+@@ -423,3 +410,4 @@
  #	Verbose false
  #</Plugin>
  


Index: collectd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/collectd/F-9/collectd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- collectd.spec	30 Nov 2008 13:50:13 -0000	1.12
+++ collectd.spec	7 Dec 2008 20:56:19 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Statistics collection daemon for filling RRD files
 Name: collectd
 Version: 4.5.1
-Release: 1%{?dist}
+Release: 2.1%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 URL: http://collectd.org/
@@ -254,7 +254,9 @@
 %exclude %{_sysconfdir}/collectd.d/libvirt.conf
 %exclude %{_sysconfdir}/collectd.d/mysql.conf
 %exclude %{_sysconfdir}/collectd.d/nginx.conf
+%exclude %{_sysconfdir}/collectd.d/nut.conf
 %exclude %{_sysconfdir}/collectd.d/perl.conf
+%exclude %{_sysconfdir}/collectd.d/postgresql.conf
 %exclude %{_sysconfdir}/collectd.d/rrdtool.conf
 %exclude %{_sysconfdir}/collectd.d/sensors.conf
 %exclude %{_sysconfdir}/collectd.d/snmp.conf
@@ -379,6 +381,9 @@
 
 
 %changelog
+* Sun Dec 07 2008 Alan Pevec <apevec at redhat.com> 4.5.1-2.1
+- fix subpackages, bz# 475093
+
 * Sun Nov 30 2008 Alan Pevec <apevec at redhat.com> 4.5.1-1
 - upgrade to 4.5.1, bz# 470943
 - enable Network UPS Tools (nut) plugin, bz# 465729