summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Pevec <apevec@fedoraproject.org>2008-12-07 20:37:28 +0000
committerAlan Pevec <apevec@fedoraproject.org>2008-12-07 20:37:28 +0000
commit1d20009cb2d93b4af03daf270edc07239666e4d6 (patch)
tree60d052565df5640a9e387758b727b6884adbbe0f
parentf4cb061d6c375b4d9cbc6148944cd61405149b14 (diff)
downloadcollectd-1d20009cb2d93b4af03daf270edc07239666e4d6.tar.gz
collectd-1d20009cb2d93b4af03daf270edc07239666e4d6.tar.xz
collectd-1d20009cb2d93b4af03daf270edc07239666e4d6.zip
- fix subpackages, bz# 475093collectd-4_5_1-2_fc11
-rw-r--r--collectd-4.5.1-include-collectd.d.patch8
-rw-r--r--collectd.spec5
2 files changed, 9 insertions, 4 deletions
diff --git a/collectd-4.5.1-include-collectd.d.patch b/collectd-4.5.1-include-collectd.d.patch
index e5b4816..832ca74 100644
--- a/collectd-4.5.1-include-collectd.d.patch
+++ b/collectd-4.5.1-include-collectd.d.patch
@@ -8,15 +8,15 @@
@BUILD_PLUGIN_APCUPS_TRUE@LoadPlugin apcups
@BUILD_PLUGIN_APPLE_SENSORS_TRUE@LoadPlugin apple_sensors
@BUILD_PLUGIN_ASCENT_TRUE@LoadPlugin ascent
-@@ -36,7 +35,6 @@
+@@ -36,42 +35,30 @@
@BUILD_PLUGIN_CSV_TRUE@LoadPlugin csv
@BUILD_PLUGIN_DF_TRUE@LoadPlugin df
@BUILD_PLUGIN_DISK_TRUE@LoadPlugin disk
-@BUILD_PLUGIN_DNS_TRUE@LoadPlugin dns
- @BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email
+-@BUILD_PLUGIN_EMAIL_TRUE@LoadPlugin email
@BUILD_PLUGIN_ENTROPY_TRUE@LoadPlugin entropy
@BUILD_PLUGIN_EXEC_TRUE@LoadPlugin exec
-@@ -44,34 +42,24 @@
+ @BUILD_PLUGIN_FILECOUNT_TRUE@LoadPlugin filecount
@BUILD_PLUGIN_HDDTEMP_TRUE@LoadPlugin hddtemp
@BUILD_PLUGIN_INTERFACE_TRUE@LoadPlugin interface
@BUILD_PLUGIN_IPTABLES_TRUE@LoadPlugin iptables
@@ -51,7 +51,7 @@
@BUILD_PLUGIN_SWAP_TRUE@LoadPlugin swap
@BUILD_PLUGIN_TAIL_TRUE@LoadPlugin tail
@BUILD_PLUGIN_TAPE_TRUE@LoadPlugin tape
-@@ -423,3 +411,4 @@
+@@ -423,3 +410,4 @@
# Verbose false
#</Plugin>
diff --git a/collectd.spec b/collectd.spec
index e2dd7a0..ce940a4 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -253,7 +253,9 @@ fi
%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
@@ -378,6 +380,9 @@ fi
%changelog
+* Sun Dec 07 2008 Alan Pevec <apevec@redhat.com> 4.5.1-2.1
+- fix subpackages, bz# 475093
+
* Sun Nov 30 2008 Alan Pevec <apevec@redhat.com> 4.5.1-2
- workaround for https://bugzilla.redhat.com/show_bug.cgi?id=468067