diff options
| -rw-r--r-- | collectd.spec | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/collectd.spec b/collectd.spec index 34a8912..cf042a9 100644 --- a/collectd.spec +++ b/collectd.spec @@ -1,7 +1,7 @@ Summary: Statistics collection daemon for filling RRD files Name: collectd Version: 4.10.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons URL: http://collectd.org/ @@ -347,9 +347,6 @@ chmod +x %{buildroot}/%{_datadir}/collectd/collection3/bin/*.cgi mkdir perl-examples find contrib -name '*.p[lm]' -exec mv {} perl-examples/ \; -# postresql config example will be included by %doc -rm %{buildroot}%{_datadir}/collectd/postgresql_default.conf - # Move config contribs mkdir -p %{buildroot}/etc/collectd.d/ cp contrib/redhat/apache.conf %{buildroot}/etc/collectd.d/apache.conf @@ -445,6 +442,7 @@ fi %exclude %{_sysconfdir}/collectd.d/perl.conf %exclude %{_sysconfdir}/collectd.d/ping.conf %exclude %{_sysconfdir}/collectd.d/postgresql.conf +%exclude %{_datadir}/collectd/postgresql_default.conf %exclude %{_sysconfdir}/collectd.d/rrdtool.conf %exclude %{_sysconfdir}/collectd.d/sensors.conf %exclude %{_sysconfdir}/collectd.d/snmp.conf @@ -611,7 +609,7 @@ fi %defattr(-, root, root, -) %{_libdir}/collectd/postgresql.so %config(noreplace) %{_sysconfdir}/collectd.d/postgresql.conf -%doc src/postgresql_default.conf +%{_datadir}/collectd/postgresql_default.conf %files rrdtool @@ -648,6 +646,10 @@ fi %endif %changelog +* Mon Nov 26 2012 Alan Pevec <apevec@redhat.com> 4.10.8-2 +- spec cleanups from Ruben Kerkhof +- fix postgresql_default.conf location rhbz#681615 + * Sun Nov 18 2012 Kevin Fenzi <kevin@scrye.com> 4.10.8-1 - Update to 4.10.8 |