- up to 4.10.2

[packages/collectd.git] / collectd.spec

diff --git a/collectd.spec b/collectd.spec
index e6eeefc489ce7835991f0abf09ba5d7dd27946e2..a9a9b0598cbb4f7685e43f877a57060cbcc14183 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -10,7 +10,6 @@
 #   libjvm  . . . . . . . no (javac not found)
 #   libkstat  . . . . . . no (Solaris only)
 #   libkvm  . . . . . . . no
-#   libmemcached  . . . . no (libmemcached/memcached.h not found)
 #   libnetapp . . . . . . no (netapp_api.h not found)
 #   libperl . . . . . . . no
 #   librouteros . . . . . no ('routeros_api.h' not found)
@@ -18,7 +17,7 @@
 #   libvirt . . . . . . . no (pkg-config doesn't know library)
 #   libyajl . . . . . . . no (yajl/yajl_parse.h not found)
 #   oracle  . . . . . . . no (ORACLE_HOME is not set)
-# - Disabled modules:
+# - Disabled modules (build most of them an package):
 #   apple_sensors . . . no             (obvious)
 #   ipvs  . . . . . . . no             (ip_vs.h not found - llh to be fixed)
 #   libvirt . . . . . . no             (requires library)
@@ -30,11 +29,9 @@
 #   curl_json . . . . . . no
 #   gmond . . . . . . . . no
 #   java  . . . . . . . . no
-#   memcachec . . . . . . no
 #   netapp  . . . . . . . no
 #   oracle  . . . . . . . no
 #   routeros  . . . . . . no
-#   rrdcached . . . . . . no
 #   tokyotyrant . . . . . no
 #   zfs_arc . . . . . . . no
 # - logrotate file for logfile plugin
@@ -69,12 +66,12 @@
 Summary:       Collects system information in RRD files
 Summary(pl.UTF-8):     Zbieranie informacji o systemie w plikach RRD
 Name:          collectd
-Version:       4.9.1
-Release:       0.9
+Version:       4.10.2
+Release:       1
 License:       GPL v2
 Group:         Daemons
 Source0:       http://collectd.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 5753496651c8c84afaea1fe290876bfc
+# Source0-md5: 85d9d8d0a1327782661e3c89800aa70e
 Source1:       %{name}.conf
 Source2:       %{name}.init
 Source3:       %{name}-http.conf
@@ -82,6 +79,7 @@ Source4:      %{name}-lighttpd.conf
 Source10:      %{name}-df.conf
 Source11:      %{name}-rrdtool.conf
 Patch0:                %{name}-collection.patch
+Patch1:                compile.patch
 URL:           http://collectd.org/
 %{?with_ipmi:BuildRequires:    OpenIPMI-devel >= 2.0.14-3}
 BuildRequires: autoconf
@@ -586,6 +584,18 @@ Requires:  %{name} = %{version}-%{release}
 %description mbmon
 The mbmon plugin uses mbmon to retrieve temperature, voltage, etc.
 
+%package memcachec
+Summary:       memcachec-plugin for collectd
+Summary(pl_PL.UTF-8):  Wtyczka memcachec dla collectd
+Group:         Daemons
+Requires:      %{name} = %{version}-%{release}
+
+%description memcachec
+The memcachec plugin connects to a memcached server, queries one or more
+given pages and parses the returned data according to user specification.
+The matches used are similar to the matches used in the cURL and Tail
+plugins.
+
 %package memcached
 Summary:       memcached-plugin for collectd
 Summary(pl_PL.UTF-8):  Wtyczka memcached dla collectd
@@ -1091,6 +1101,7 @@ Perl files from Collectd package
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -1224,6 +1235,7 @@ fi
 %module_scripts match_timediff
 %module_scripts match_value
 %module_scripts mbmon
+%module_scripts memcachec
 %module_scripts memcached
 %module_scripts memory
 %module_scripts multimeter
@@ -1408,6 +1420,10 @@ fi
 %defattr(640,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/curl.conf
 %attr(755,root,root) %{_libdir}/%{name}/curl.so
+%if %{with xml}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/curl_xml.conf
+%attr(755,root,root) %{_libdir}/%{name}/curl_xml.so
+%endif
 %endif
 
 %files dbi
@@ -1534,6 +1550,11 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/mbmon.conf
 %attr(755,root,root) %{_libdir}/%{name}/mbmon.so
 
+%files memcachec
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/memcachec.conf
+%attr(755,root,root) %{_libdir}/%{name}/memcachec.so
+
 %files memcached
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/memcached.conf