summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Pevec <apevec@redhat.com>2012-11-21 13:13:26 +0100
committerAlan Pevec <apevec@redhat.com>2012-11-23 19:28:08 +0100
commit834a35d12577075ed03843927d4dad7de7fb0486 (patch)
tree1c562877fbb7ba7f475e703a5e54877e13637151
parentc8548f64b1f7520a5f23c54803e622c6fe698718 (diff)
downloadcollectd-834a35d12577075ed03843927d4dad7de7fb0486.tar.gz
collectd-834a35d12577075ed03843927d4dad7de7fb0486.tar.xz
collectd-834a35d12577075ed03843927d4dad7de7fb0486.zip
fix postgresql_default.conf location
rhbz#681615
-rw-r--r--collectd.spec7
1 files changed, 3 insertions, 4 deletions
diff --git a/collectd.spec b/collectd.spec
index bce23aa..ec9cead 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -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
@@ -620,7 +618,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
@@ -660,6 +658,7 @@ fi
* Wed Nov 21 2012 Alan Pevec <apevec@redhat.com> 5.1.1-1
- update to 5.1.1
- spec cleanups from Ruben Kerkhof
+- fix postgresql_default.conf location rhbz#681615
* Mon Nov 19 2012 Alan Pevec <apevec@redhat.com> 5.0.5-1
- new upstream version 5.0.5