Merge branch 'collectd-3.9'

[collectd.git] / collectd.spec

diff --git a/collectd.spec b/collectd.spec
index 41d2cbebffc614629a44ff156d20444291c6294e..fe6430aad5b9513de2c7c9da8c8e06b0da3dda67 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,12 +1,12 @@
 Summary:       Statistics collection daemon for filling RRD files.
 Name:           collectd
-Version:       3.8.1
+Version:       3.9.4
 Release:       1
-Source:                http://verplant.org/collectd/%{name}-%{version}.tar.gz
+Source:                http://collectd.org/files/%{name}-%{version}.tar.gz
 License:       GPL
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-BuildPrereq:   lm_sensors-devel, mysqlclient10-devel | mysql-devel, rrdtool-devel
+BuildPrereq:   lm_sensors-devel, mysql-devel, rrdtool-devel
 Requires:      rrdtool
 Packager:      Florian octo Forster <octo@verplant.org>
 Vendor:                Florian octo Forster <octo@verplant.org>
@@ -18,10 +18,17 @@ Since the daemon doesn't need to startup every time it wants to update the
 files it's very fast and easy on the system. Also, the statistics are very
 fine grained since the files are updated every 10 seconds.
 
+%package apache
+Summary:       apache-plugin for collectd.
+Group:         System Environment/Daemons
+Requires:      collectd = %{version}, libcurl3
+%description apache
+This plugin collectd data provided by Apache's `mod_status'.
+
 %package mysql
 Summary:       mysql-module for collectd.
 Group:         System Environment/Daemons
-Requires:      collectd = %{version}, mysqlclient10 | mysql
+Requires:      collectd = %{version}, mysql
 %description mysql
 MySQL  querying  plugin.  This plugins  provides data of  issued commands,
 called handlers and database traffic.
@@ -63,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{_sbindir}/collectd
 %attr(0444,root,root) %{_mandir}/man1/*
 %attr(0444,root,root) %{_mandir}/man5/*
+%attr(0444,root,root) %{_libdir}/%{name}/apple_sensors.so*
+%attr(0444,root,root) %{_libdir}/%{name}/apcups.so*
 %attr(0444,root,root) %{_libdir}/%{name}/battery.so*
 %attr(0444,root,root) %{_libdir}/%{name}/cpu.so*
 %attr(0444,root,root) %{_libdir}/%{name}/cpufreq.so*
@@ -79,8 +88,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0444,root,root) %{_libdir}/%{name}/tape.so*
 %attr(0444,root,root) %{_libdir}/%{name}/traffic.so*
 %attr(0444,root,root) %{_libdir}/%{name}/users.so*
+%attr(0444,root,root) %{_libdir}/%{name}/vserver.so*
+%attr(0444,root,root) %{_libdir}/%{name}/wireless.so*
 %dir /var/lib/collectd
 
+%files apache
+%attr(0444,root,root) %{_libdir}/%{name}/apache.so*
+
 %files mysql
 %attr(0444,root,root) %{_libdir}/%{name}/mysql.so*
 
@@ -88,6 +102,28 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0444,root,root) %{_libdir}/%{name}/sensors.so*
 
 %changelog
+* Tue Jun 25 2006 Florian octo Forster <octo@verplant.org> 3.9.4-1
+- New upstream version
+
+* Tue Jun 01 2006 Florian octo Forster <octo@verplant.org> 3.9.3-1
+- New upstream version
+
+* Tue May 09 2006 Florian octo Forster <octo@verplant.org> 3.9.2-1
+- New upstream version
+
+* Tue May 09 2006 Florian octo Forster <octo@verplant.org> 3.8.5-1
+- New upstream version
+
+* Fri Apr 21 2006 Florian octo Forster <octo@verplant.org> 3.9.1-1
+- New upstream version
+
+* Fri Apr 14 2006 Florian octo Forster <octo@verplant.org> 3.9.0-1
+- New upstream version
+- Added the `apache' package.
+
+* Thu Mar 14 2006 Florian octo Forster <octo@verplant.org> 3.8.2-1
+- New upstream version
+
 * Thu Mar 13 2006 Florian octo Forster <octo@verplant.org> 3.8.1-1
 - New upstream version