summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Pevec <apevec@redhat.com>2012-02-28 21:55:02 +0100
committerAlan Pevec <apevec@redhat.com>2012-09-17 19:17:41 +0200
commitf1e819596bcad2b9584e777803318c4437c5f7f2 (patch)
tree7006eaed296e19e1ab68b8491946a3bd7a89bc9f
parentb8e4a58acf87bc3a3624e26d25d1dce290ee38e2 (diff)
downloadcollectd-f1e819596bcad2b9584e777803318c4437c5f7f2.tar.gz
collectd-f1e819596bcad2b9584e777803318c4437c5f7f2.tar.xz
collectd-f1e819596bcad2b9584e777803318c4437c5f7f2.zip
update to 5.0 (from Andrew.Elwell@gmail.com)
-rw-r--r--collectd-4.10.4-include-collectd.d.patch19
-rw-r--r--collectd-include-collectd.d.patch19
-rw-r--r--collectd.spec16
-rw-r--r--sources2
4 files changed, 32 insertions, 24 deletions
diff --git a/collectd-4.10.4-include-collectd.d.patch b/collectd-4.10.4-include-collectd.d.patch
deleted file mode 100644
index a37706d..0000000
--- a/collectd-4.10.4-include-collectd.d.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- collectd-4.10.4/src/collectd.conf.in 2011-10-14 22:46:13.000000000 +0200
-+++ collectd-4.10.4/src/collectd.conf.in 2011-11-29 02:53:03.975913077 +0100
-@@ -120,7 +120,7 @@
- #@BUILD_PLUGIN_PYTHON_TRUE@</LoadPlugin>
- #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
- #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
--@LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
-+#@LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
- #@BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors
- #@BUILD_PLUGIN_SERIAL_TRUE@LoadPlugin serial
- #@BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
-@@ -762,6 +762,7 @@
- # CreateFiles true
- # CollectStatistics true
- #</Plugin>
-+Include "/etc/collectd.d"
-
- #<Plugin rrdtool>
- # DataDir "@prefix@/var/lib/@PACKAGE_NAME@/rrd"
diff --git a/collectd-include-collectd.d.patch b/collectd-include-collectd.d.patch
new file mode 100644
index 0000000..2e5dcd0
--- /dev/null
+++ b/collectd-include-collectd.d.patch
@@ -0,0 +1,19 @@
+--- src/collectd.conf.in.orig 2012-02-19 11:17:59.000000000 +0100
++++ src/collectd.conf.in 2012-02-26 15:54:51.463235956 +0100
+@@ -19,6 +19,7 @@
+ #Interval 10
+ #Timeout 2
+ #ReadThreads 5
++Include "/etc/collectd.d"
+
+ ##############################################################################
+ # Logging #
+@@ -123,7 +124,7 @@
+ #@BUILD_PLUGIN_REDIS_TRUE@LoadPlugin redis
+ #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros
+ #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached
+-@LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
++#@LOAD_PLUGIN_RRDTOOL@LoadPlugin rrdtool
+ #@BUILD_PLUGIN_SENSORS_TRUE@LoadPlugin sensors
+ #@BUILD_PLUGIN_SERIAL_TRUE@LoadPlugin serial
+ #@BUILD_PLUGIN_SNMP_TRUE@LoadPlugin snmp
diff --git a/collectd.spec b/collectd.spec
index 1cee538..0285f00 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,7 +1,7 @@
Summary: Statistics collection daemon for filling RRD files
Name: collectd
-Version: 4.10.7
-Release: 3%{?dist}
+Version: 5.0.4
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
URL: http://collectd.org/
@@ -10,7 +10,7 @@ Source: http://collectd.org/files/%{name}-%{version}.tar.bz2
Source1: collectd-httpd.conf
Source2: collection.conf
Source3: collectd.service
-Patch1: %{name}-4.10.4-include-collectd.d.patch
+Patch1: %{name}-include-collectd.d.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -187,7 +187,7 @@ This plugin collects information from virtualized guests.
%prep
%setup -q
-%patch1 -p1
+%patch1
sed -i.orig -e 's|-Werror||g' Makefile.in */Makefile.in
@@ -451,6 +451,7 @@ fi
%{_initrddir}/collectd
%endif
%{_bindir}/collectd-nagios
+%{_bindir}/collectdctl
%{_sbindir}/collectd
%{_sbindir}/collectdmon
%dir %{_localstatedir}/lib/collectd/
@@ -493,9 +494,11 @@ fi
%{_libdir}/collectd/syslog.so
%{_libdir}/collectd/tail.so
%{_libdir}/collectd/target_scale.so
+%{_libdir}/collectd/target_v5upgrade.so
%{_libdir}/collectd/tcpconns.so
%{_libdir}/collectd/teamspeak2.so
%{_libdir}/collectd/thermal.so
+%{_libdir}/collectd/threshold.so
%{_libdir}/collectd/unixsock.so
%{_libdir}/collectd/users.so
%{_libdir}/collectd/uuid.so
@@ -532,12 +535,14 @@ fi
%doc AUTHORS ChangeLog COPYING INSTALL README
%doc %{_mandir}/man1/collectd.1*
+%doc %{_mandir}/man1/collectdctl.1*
%doc %{_mandir}/man1/collectd-nagios.1*
%doc %{_mandir}/man1/collectdmon.1*
%doc %{_mandir}/man5/collectd.conf.5*
%doc %{_mandir}/man5/collectd-exec.5*
%doc %{_mandir}/man5/collectd-java.5*
%doc %{_mandir}/man5/collectd-python.5*
+%doc %{_mandir}/man5/collectd-threshold.5*
%doc %{_mandir}/man5/collectd-unixsock.5*
%doc %{_mandir}/man5/types.db.5*
@@ -644,6 +649,9 @@ fi
%endif
%changelog
+* Mon Sep 17 2012 Alan Pevec <apevec@redhat.com> 5.0.4-1
+- New upstream release, version bump to 5 (#743894) from Andrew Elwell
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.10.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 2de58f6..910dafa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4193fdb5002ddac8159c88032a726bc collectd-4.10.7.tar.bz2
+97db42beeaba88960076d5f278a48f58 collectd-5.0.4.tar.bz2