X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcollectd.git;a=blobdiff_plain;f=collectd.spec;h=29c51f9dd3fc8485f4af313d09f44357ce15242f;hp=ba2a637f960bccf047a718c844d7333b2647173f;hb=1f546c2ed706f4e12296c5c1f6d0104f5c488b5a;hpb=762d0c282bc4d2480c4fa5376bfab2e1ceb867da

diff --git a/collectd.spec b/collectd.spec
index ba2a637..29c51f9 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,34 +1,82 @@
 # TODO:
-# - mysql subpackage
-# - lm_sensors subpackage
-# - hddtemp subpackage
-# - initscripts for local/client/server mode (subpackage ?)
-# - collection CGI script
 # - package contrib scripts as %doc
+# - perl modules with Collectd classes package to separate package
+# - Disabled modules:
+#    apple_sensors . . . no		(obvious)
+#    ipvs  . . . . . . . no		(ip_vs.h not found - llh to be fixed)
+#    libvirt . . . . . . no		(requires library)
+#    multimeter  . . . . no		?
+#    onewire . . . . . . no		(needs libowfs)
+#    perl  . . . . . . . no		(needs libperl)
+#    tape  . . . . . . . no		?
+# - logrotate file for logfile plugin
+# - %desc -l pl for plugins
+#
+# Conditional build:
+%bcond_without	dns		# DNS plugin
+%bcond_without	ipmi		# IPMI plugin
+%bcond_without	iptables	# iptables plugin
+%bcond_with	multimeter	# multimeter plugin
+%bcond_without	netlink		# netlink plugin
+#
+#http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=358637
+%ifarch %{x8664}
+%undefine with_iptables
+%undefine with_netlink
+%endif
 Summary:	Collects system information in RRD files
 Summary(pl.UTF-8):	Zbieranie informacji o systemie w plikach RRD
 Name:		collectd
-Version:	3.11.2
-Release:	0.2
+Version:	4.6.2
+Release:	2
 License:	GPL v2
 Group:		Daemons
 Source0:	http://collectd.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	40f4c3689c2c049497a8b1a47e01cc75
+# Source0-md5:	9eee46a6330780d6e6b41155b159f4f9
 Source1:	%{name}.conf
-Patch0:		%{name}-include.patch
+Source2:	%{name}.init
+Source3:	%{name}-http.conf
+Source4:	%{name}-lighttpd.conf
+Source10:	%{name}-df.conf
+Source11:	%{name}-rrdtool.conf
+Patch0:		%{name}-collection.patch
 URL:		http://collectd.org/
+%{?with_ipmi:BuildRequires:	OpenIPMI-devel >= 2.0.14-3}
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	curl-devel
+BuildRequires:	gcc-c++
+BuildRequires:	hal-devel
+%{?with_iptables:BuildRequires:	iptables-devel >= 1.4.1.1-4}
+BuildRequires:	libdbi-devel
+BuildRequires:	libesmtp-devel
+BuildRequires:	libltdl-devel
+%{?with_netlink:BuildRequires:	libnetlink-devel}
+BuildRequires:	libnotify-devel
+BuildRequires:	liboping-devel
+%{?with_dns:BuildRequires:	libpcap-devel}
 BuildRequires:	libstatgrab-devel >= 0.12
-BuildRequires:	libpcap-devel
 BuildRequires:	libtool
+BuildRequires:	libxml2-devel
+BuildRequires:	lm_sensors-devel
 BuildRequires:	mysql-devel
-BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	nut-devel
+BuildRequires:	perl-devel
+BuildRequires:	postgresql-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	rrdtool-devel
+BuildRequires:	net-snmp-devel
+BuildRequires:	xmms-devel
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_pkglibdir	%{_sharedstatedir}/%{name}
+%define		_webapps	/etc/webapps
+%define		_webapp		%{name}
+%define		_webappdir	%{_webapps}/%{_webapp}
+%define		_appdir		%{_datadir}/%{_webapp}
+
 %description
 collectd is a small daemon which collects system information every 10
 seconds and writes the results in an RRD-file.
@@ -50,9 +98,739 @@ urychamiania ciężkiego interpretera za każdym razem, kiedy powinny być
 zapisane nowe wartości. Dzięki temu collect może mieć rozdzielczość 10
 sekund i nie obciążać zbytnio systemu.
 
+%package libs
+Summary:	%{name} libraries
+Summary(pl.UTF-8):	Biblioteki %{name}
+Group:		Libraries
+
+%description libs
+%{name} libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki %{name}.
+
+%package devel
+Summary:	Header files for %{name} libraries
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek %{name}
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description devel
+Header files for %{name} libraries.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek %{name}.
+
+%package apache
+Summary:	apache-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka apache dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description apache
+This plugin collectd data provided by Apache's `mod_status'.
+
+%description apache -l pl.UTF-8
+Wtyczka collectd zbierająca informacje udostępniane przez moduł
+'mod_status' Apacha.
+
+%package apcups
+Summary:	APC UPS plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka APC UPS dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description apcups
+APC UPS plugin for collectd.
+
+%package ascent
+Summary:	ascent-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka ascent dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description ascent
+ascent plugin for collectd.
+
+%package battery
+Summary:	battery plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka battery dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description battery
+This plugin collects the battery's charge, the drawn current and the
+battery's voltage.
+
+%package bind
+Summary:	bind plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka bind dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description bind
+Starting with BIND 9.5.0, the most widely used DNS server software provides
+extensive statistics about queries, responses and lots of other information.
+The bind plugin retrieves this information that's encoded in XML and provided
+via HTTP and submits the values to collectd.
+
+%package collection
+Summary:	Web script for collectd
+Summary(pl_PL.UTF-8):	Web script for collectd
+Group:		Applications/WWW
+Requires:	%{name} = %{version}-%{release}
+Requires:	perl(CGI)
+Requires:	perl(Data::Dumper)
+Requires:	perl(HTML::Entities)
+Requires:	perl(RRDs)
+Requires:	perl(URI::Escape)
+Requires:	webserver(cgi)
+Suggests:	fonts-TTF-DejaVu
+
+%description collection
+Web script for collectd.
+
+%package cpu
+Summary:	cpu-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka cpu dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description cpu
+The cpu-plugin collects the amount of time spent by the CPU in various states,
+most notably executing user code, executing system code, waiting for IO
+operations and being idle.
+
+%package cpufreq
+Summary:	cpufreq-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka cpufreq dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description cpufreq
+Collects the current CPU's frequency, mostly for mobile computers.
+
+%package csv
+Summary:	CSV output plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka wyjściowa CSV dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description csv
+CSV output plugin for collectd.
+
+%package curl
+Summary:	cURL output plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka wyjściowa cURL dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description curl
+The curl plugin uses the libcurl to read web pages and the match
+infrastructure (the same code used by the tail plugin) to use regular
+expressions with the received data.
+
+%package dbi
+Summary:	dbi plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka dbi dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description dbi
+This plugin uses the dbi library to connect to various databases, execute
+SQL statements and read back the results. dbi is an acronym for "database
+interface" in case you were wondering about the name. You can configure how
+each column is to be interpreted and the plugin will generate one or more
+data sets from each row returned according to these rules.
+
+%package df
+Summary:	df-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka df dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description df
+The df-plugin collects file system usage information, i. e. basically how
+much space on a mounted partition is used and how much is available. It's
+named after and very similar to the df(1) UNIX command that's been around
+forever.
+
+%package disk
+Summary:	disk-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka disk dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description disk
+This plugin collects performance statistics of harddisks and, where
+supported, partitions.
+
+%package dns
+Summary:	dns-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka dns dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	perl-rrdtool
+
+%description dns
+This plugin has a similar functionality to dnstop: It uses libpcap to get
+a copy of all traffic from/to port UDP/53 (that's the DNS port), interprets
+the packets and collects statistics of your DNS traffic.
+
+%package email
+Summary:	email-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka email dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description email
+The email plugin opens an UNIX-socket over which one can submit email
+statistics, such as the number of ``ham'', ``spam'', ``virus'', etc. mails
+received/handled, spam scores and matched spam checks.
+
+This plugin is intended to be used with the the
+Mail::SpamAssassin::Plugin::Collectd manpage SpamAssassin-plugin which is
+included in contrib/, but is of course not limited to that use.
+
+%package entropy
+Summary:	entropy-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka entropy dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description entropy
+entropy plugin for collectd.
+
+%package exec
+Summary:	exec-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka exec dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description exec
+The exec plugin forks of an executable either to receive values or to
+dispatch notifications to the outside world.
+
+%package filecount
+Summary:	filecount-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka filecount dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description filecount
+The filecount-plugin does something very simple: Count the number of files
+in a directory and all its subdirectories. This can be used for a variety of
+statistics, for example the queue length of an MTA, the number of PHP
+sessions of a web server or simply the number of files in your home
+directory.
+
+%package hddtemp
+Summary:	hddtemp-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka hddtemp dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Suggests:	hddtemp-hddtempd
+
+%description hddtemp
+Temperature of harddisks. The temperatures are provided via S.M.A.R.T. and
+queried by the external hddtemp-daemon.
+
+%package interface
+Summary:	interface-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka interface dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description interface
+The interface-plugin collects information about the traffic (octets), packets
+and errors of interfaces.
+
+%package iptables
+Summary:	iptables-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka iptables dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description iptables
+With this plugin you can gather statistics from your ip_tables based
+packetfilter (aka. firewall). It can collect the byte- and packet-counters
+of selected rules and submit them to collectd. You can select rules that
+should be collected wither by its position (e.g. "the fourth rule in the
+INPUT queue in the filter table") or by its comment (using the COMMENT
+match). This means that depending on your firewall layout you can collect
+certain services (such as the amount of web-traffic), source or destination
+hosts or networks, dropped packets and much more.
+
+%package ipmi
+Summary:	ipmi-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka ipmi dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description ipmi
+ipmi plugin for collectd.
+
+%description ipmi -l pl.UTF-8
+Wtyczka ipmi dla collectd.
+
+%package irq
+Summary:	IRQs-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka IRQs dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description irq
+IRQs plugin for collectd.
+
+%package load
+Summary:	load-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka load dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description load
+Collects the system load. These numbers give a rough overview over the
+utilization of a machine, though their meaning is mostly overrated.
+
+%package logfile
+Summary:	logfile-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka logfile dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description logfile
+Logfile plugin for collectd.
+
+%package match_regex
+Summary:	match_regex plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka match_regex dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description match_regex
+match_regex plugin for collectd.
+
+%package match_timediff
+Summary:	match_timediff plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka match_timediff dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description match_timediff
+match_timediff plugin for collectd.
+
+%package match_value
+Summary:	match_value plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka match_value dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description match_value
+match_value plugin for collectd.
+
+%package mbmon
+Summary:	mbmon plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka mbmon dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description mbmon
+The mbmon plugin uses mbmon to retrieve temperature, voltage, etc.
+
+%package memcached
+Summary:	memcached-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka memcached dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description memcached
+The memcached plugin connects to a memcached daemon and collects the number
+of connections and requests handled by the daemon, the CPU resources consumed,
+number of items cached, number of threads, and bytes sent and received.
+
+%package memory
+Summary:	memory-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka memory dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description memory
+Collects physical memory utilization for collectd.
+
+%package multimeter
+Summary:	multimeter-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka multimeter dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description multimeter
+Multimeter plugin for collectd.
+
+%package mysql
+Summary:	mysql-plugin for collectd
+Summary(pl_PL.UTF-8):	Moduł mysql dla collectd.
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description mysql
+MySQL querying plugin. This plugins provides data of issued commands,
+called handlers and database traffic.
+
+%description mysql -l pl.UTF-8
+Moduł odpytujący MySQL. Wtyczka udostępnia dane o wydawanych
+poleceniach, wywoływanych procedurach obsługi i ruchu bazodanowym.
+
+%package netlink
+Summary:	netlink-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka netlink dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description netlink
+This plugin will open a netlink socket to the Linux kernel and use it to get
+statistics for interfaces, qdiscs, classes, and, if you can make use of it,
+filters. Since in most setups many of the statistics this plugin can collect
+aren't of interest, you can select which information to gather using the
+configuration.
+
+%package network
+Summary:	network-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka network dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description network
+nginx plugin for collectd.
+
+%package nfs
+Summary:	NFS-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka NFS dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description nfs
+The nfs plugin counts the number of procedure calls of the different NFS
+procedures.
+
+%package nginx
+Summary:	nginx-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka nginx dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description nginx
+This plugin collects the number of connections and requests handled by the
+nginx daemon, a HTTP and mail server/proxy. It queries the page provided by
+the ngx_http_stub_status_module module, which isn't compiled by default.
+
+%package notify_desktop
+Summary:	notify_desktop for collectd
+Summary(pl_PL.UTF-8):	Wtyczka notify_desktop dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description notify_desktop
+This plugin sends a desktop notification to a notification daemon, as
+defined in the Desktop Notification Specification. To actually display the
+notifications, notification-daemon is required and collectd has to be able
+to access the X server.
+
+%package notify_email
+Summary:	notify_email-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka notify_email dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description notify_email
+notify_email plugin for collectd.
+
+%package ntpd
+Summary:	ntpd-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka ntpd dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description ntpd
+NTPd plugin for collectd.
+
+%package nut
+Summary:	nut-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka nut dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description nut
+UPS statistics using the Network UPS Tools. These statistics include
+basically everything NUT will give us, including voltages, currents, power,
+frequencies, load, and temperatures.
+
+%package openvpn
+Summary:	openvpn plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka openvpn dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	openvpn
+
+%description openvpn
+The OpenVPN plugin reads a status file maintained by OpenVPN and gathers
+traffic statistics about connected clients.
+
+%package ping
+Summary:	ping-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka ping dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description ping
+The network latency is measured as a roundtrip time. An ICMP-echo-request
+(aka. "ping")is sent to a host and the time needed for his echo-reply (aka.
+"pong") to arrive is measured. If a reply is not received within one second
+the plugin will no longer expect a reply and return. This may happen in
+several circumstances, e. g. the packet is lost, the host is down, a router
+has dismissed the packet, etc.
+
+%package postgresql
+Summary:	mysql-plugin for collectd
+Summary(pl_PL.UTF-8):	Moduł postgresql dla collectd.
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description postgresql
+The postgresql plugin queries statistics from PostgreSQL databases. It keeps
+a persistent connection to all configured databases and tries to reconnect
+if the connection has been interrupted.
+
+%package powerdns
+Summary:	powerdns-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka powerdns dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description powerdns
+The powerdns plugin queries statistics from an authoritative PowerDNS
+nameserver and/or a PowerDNS recursor. Since both offer a wide variety of
+values, many of which are probably meaningless to most users, but may be
+useful for some.
+
+%package processes
+Summary:	processes-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka processes dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description processes
+This plugin collects the number of processes, grouped by their state (e.g.
+running, sleeping, zombies, etc.). In addition to that, it can select
+detailed statistics about selected processes, grouped by name.
+
+%package rrdtool
+Summary:	rrdtool-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka rrdtool dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	rrdtool
+
+%description rrdtool
+RRDTOOL plugin for collectd.
+
+%package sensors
+Summary:	sensors-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka sensors dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description sensors
+This plugin uses lm-sensors to read hardware sensors. You will need to
+configure lm-sensors before this plugin will collect any usefull and correct
+data.
+
+%module_scripts serial
+%package serial
+Summary:	serial-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka serial dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description serial
+Serial plugin for collectd.
+
+%package snmp
+Summary:	snmp-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka snmp dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description snmp
+The snmp plugin queries other hosts using SNMP, the Simple Network
+Management Protocol, and translates the value it receives to collectd's
+internal format and dispatches them. Depending on the write plugins you have
+loaded they may be written to disk or submitted to another instance or
+whatever you configured.
+
+%package swap
+Summary:	swap-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka swap dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description swap
+Swap space plugin for collectd.
+
+%package syslog
+Summary:	syslog-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka syslog dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description syslog
+Syslog plugin for collectd.
+
+%package target_notification
+Summary:	target_notification-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka target_notification dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description target_notification
+target_notification plugin for collectd.
+
+%package target_replace
+Summary:	target_replace-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka target_replace dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description target_replace
+target_replace plugin for collectd.
+
+%package target_set
+Summary:	target_set-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka target_set dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description target_set
+target_set plugin for collectd.
+
+%package tail
+Summary:	tail-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka tail dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description tail
+The tail-plugin can be used to "tail" logfiles, i.e. follow them as tail -F
+does. Each line is given to one or more "matches" which test if the line is
+relevant for any statistics using a regular expression.
+
+%package tcpconns
+Summary:	tcpconns-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka tcpconns dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description tcpconns
+The tcpconns-plugin counts the number of TCP connections to or from a
+specified port. Typically the connectioins where you specify the local port
+are incoming connections while the connections where you specify the remote
+port are outgoing connections.
+
+%package teamspeak2
+Summary:	teamspeak2-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka teamspeak2 dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description teamspeak2
+The teamspeak2 plugin connects to the query port of a teamspeak2 server and
+polls interesting global and virtual server data. The plugin can query only
+one physical server but unlimited virtual servers.
+
+%package thermal
+Summary:	thermal-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka thermal dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description thermal
+Thermal plugin for collectd.
+
+%package unixsock
+Summary:	unixsock-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka unixsock dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description unixsock
+The unixsock plugin opens an UNIX-socket over which one can interact with
+the daemon. This can be used to use the values collected by collectd in
+other applications, such as monitoring, or submit externally collected
+values to collectd.
+
+%package users
+Summary:	users-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka users dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description users
+Number of users currently logged in.
+
+%package uuid
+Summary:	uuid-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka uuid dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description uuid
+This plugin, if loaded, causes the Hostname to be taken from the machine's
+UUID. The UUID is a universally unique designation for the machine, usually
+taken from the machine's BIOS. This is most useful if the machine is
+running in a virtual environment such as Xen, in which case the UUID is
+preserved across shutdowns and migration.
+
+%package vmem
+Summary:	vmem-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka vmem dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description vmem
+The vmem plugin collects information about the usage of virtual memory.
+Since the statistics provided by the Linux kernel are very detailed, they
+are collected very detailed.
+
+%package vserver
+Summary:	vserver-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka vserver dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description vserver
+Collects information about the virtual servers running on a system, using
+Linux-Vserver.
+
+%package wireless
+Summary:	wireless-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka wireless dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description wireless
+Wireless plugin for collectd.
+
+%package xmms
+Summary:	xmms-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka xmms dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description xmms
+This plugin collectd data provided by XMMS.
+
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -60,20 +838,57 @@ sekund i nie obciążać zbytnio systemu.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+
 %configure \
 	--with-libstatgrab=/usr \
 	--with-lm-sensors=/usr \
 	--with-libmysql=/usr \
-%{__make}
+	--%{?with_dns:en}%{!?with_dns:dis}able-dns \
+	--%{?with_ipmi:en}%{!?with_ipmi:dis}able-ipmi \
+	--%{?with_iptables:en}%{!?with_iptables:dis}able-iptables \
+	--%{?with_multimeter:en}%{!?with_multimeter:dis}able-multimeter \
+	--%{?with_netlink:en}%{!?with_netlink:dis}able-netlink \
+	--disable-ipvs \
+	--disable-libvirt \
+	--disable-perl
+
+
+%{__make} LDFLAGS="%{rpmldflags} -lstatgrab" \
+	BUILD_WITH_OPENIPMI_CFLAGS="-I/usr/include" \
+	BUILD_WITH_OPENIPMI_LIBS="-L/usr/lib64 -lOpenIPMIutils -lOpenIPMIpthread"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_var}/{log/,lib/%{name}},/etc/{rc.d/init.d/,collectd.d}} \
+	$RPM_BUILD_ROOT{%{_appdir}/cgi-bin,%{_webappdir},%{_pkglibdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+touch $RPM_BUILD_ROOT%{_var}/log/collectd.log
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+
+# Web frontend:
+install contrib/collection.conf $RPM_BUILD_ROOT%{_webappdir}
+install contrib/collection.cgi $RPM_BUILD_ROOT%{_appdir}/cgi-bin
+install %{SOURCE3} $RPM_BUILD_ROOT%{_webappdir}/apache.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_webappdir}/httpd.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{_webappdir}/lighttpd.conf
+
+### Configs instalation ###
+for i in `egrep "^(#|)LoadPlugin" src/collectd.conf |awk '{print $NF}' ` ; do
+	egrep "LoadPlugin $i$" src/collectd.conf | %{__sed} -e "s/^#//" > $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/$i.conf
+	grep -v LoadPlugin src/collectd.conf |%{__sed} -e '/./{H;$!d;}' -e "x;/ $i>/!d;" >> $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/$i.conf
+done
+
+# Example config in sources: src/collectd.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.conf
 
+# Overwrite only files which we want to change:
+install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/df.conf
+install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/rrdtool.conf
+
+# Cleanups:
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 
 %clean
@@ -89,45 +904,481 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del %{name}
 fi
 
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%define module_scripts() \
+%post %1 \
+%service %{name} restart \
+\
+%postun %1 \
+%service %{name} restart
+
+%module_scripts apache
+%module_scripts apcups
+%module_scripts ascent
+%module_scripts battery
+%module_scripts bind
+%module_scripts cpufreq
+%module_scripts cpu
+%module_scripts csv
+%module_scripts curl
+%module_scripts dbi
+%module_scripts df
+%module_scripts disk
+%{?with_dns:%module_scripts dns}
+%module_scripts email
+%module_scripts entropy
+%module_scripts exec
+%module_scripts filecount
+%module_scripts hddtemp
+%module_scripts interface
+%{?with_ipmi:%module_scripts ipmi}
+%{?with_iptables:%module_scripts iptables}
+%module_scripts irq
+%module_scripts load
+%module_scripts logfile
+%module_scripts match_regex
+%module_scripts match_timediff
+%module_scripts match_value
+%module_scripts mbmon
+%module_scripts memcached
+%module_scripts memory
+%{?with_multimeter:%module_scripts multimeter}
+%module_scripts mysql
+%{?with_netlink:%module_scripts netlink}
+%module_scripts network
+%module_scripts nfs
+%module_scripts nginx
+%module_scripts notify_desktop
+%module_scripts notify_email
+%module_scripts ntpd
+%module_scripts nut
+%module_scripts openvpn
+%module_scripts ping
+%module_scripts postgresql
+%module_scripts powerdns
+%module_scripts processes
+%module_scripts rrdtool
+%module_scripts sensors
+%module_scripts serial
+%module_scripts snmp
+%module_scripts swap
+%module_scripts syslog
+%module_scripts tail
+%module_scripts target_notification
+%module_scripts target_replace
+%module_scripts target_set
+%module_scripts tcpconns
+%module_scripts teamspeak2
+%module_scripts thermal
+%module_scripts unixsock
+%module_scripts users
+%module_scripts uuid
+%module_scripts vmem
+%module_scripts vserver
+%module_scripts wireless
+%module_scripts xmms
+
+%triggerin collection -- apache1 < 1.3.37-3, apache1-base
+%webapp_register apache %{_webapp}
+
+%triggerun collection -- apache1 < 1.3.37-3, apache1-base
+%webapp_unregister apache %{_webapp}
+
+%triggerin collection -- apache < 2.2.0, apache-base
+%webapp_register httpd %{_webapp}
+
+%triggerun collection -- apache < 2.2.0, apache-base
+%webapp_unregister httpd %{_webapp}
+
+%triggerin collection -- lighttpd
+%webapp_register lighttpd %{_webapp}
+
+%triggerun collection -- lighttpd
+%webapp_unregister lighttpd %{_webapp}
+
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
-
+%doc AUTHORS ChangeLog README TODO contrib
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
+%dir %{_sysconfdir}/%{name}.d
 %attr(755,root,root) %{_sbindir}/collectd
+%attr(755,root,root) %{_sbindir}/collectdmon
+%attr(755,root,root) %{_bindir}/collectd-nagios
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/types.db
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
+%{_mandir}/man1/collectd.1*
+%{_mandir}/man1/collectd-nagios.1*
+%{_mandir}/man5/collectd.conf.5*
+%{_mandir}/man5/collectd-perl.5*
+%{_mandir}/man1/collectdmon.1*
+%{_mandir}/man5/types.db.5*
+%dir %{_var}/lib/%{name}
+
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcollectdclient.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcollectdclient.so.0
 %dir %{_libdir}/%{name}
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcollectdclient.so
+%{_libdir}/libcollectdclient.la
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/*.h
+%{_pkgconfigdir}/libcollectdclient.pc
+
+%files collection
+%defattr(644,root,root,755)
+%dir %{_webappdir}
+%config(noreplace) %verify(not md5 mtime size) %{_webappdir}/collection.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/lighttpd.conf
+%dir %{_appdir}
+%dir %{_appdir}/cgi-bin
+%attr(755,root,root) %{_appdir}/cgi-bin/collection.cgi
+
+########## PLUGINS:
+%files apache
+%defattr(640,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/apache.conf
 %attr(755,root,root) %{_libdir}/%{name}/apache.so
+
+%files apcups
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/apcups.conf
 %attr(755,root,root) %{_libdir}/%{name}/apcups.so
-%attr(755,root,root) %{_libdir}/%{name}/apple_sensors.so
+
+%files ascent
+%defattr(640,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/ascent.conf
+%attr(755,root,root) %{_libdir}/%{name}/ascent.so
+
+%files battery
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/battery.conf
 %attr(755,root,root) %{_libdir}/%{name}/battery.so
-%attr(755,root,root) %{_libdir}/%{name}/cpufreq.so
+
+%files bind
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/bind.conf
+%attr(755,root,root) %{_libdir}/%{name}/bind.so
+
+%files cpu
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/cpu.conf
 %attr(755,root,root) %{_libdir}/%{name}/cpu.so
+
+%files cpufreq
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/cpufreq.conf
+%attr(755,root,root) %{_libdir}/%{name}/cpufreq.so
+
+%files csv
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/csv.conf
+%attr(755,root,root) %{_libdir}/%{name}/csv.so
+
+%files curl
+%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
+
+%files dbi
+%defattr(640,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/dbi.conf
+%attr(755,root,root) %{_libdir}/%{name}/dbi.so
+
+%files df
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/df.conf
 %attr(755,root,root) %{_libdir}/%{name}/df.so
+
+%files disk
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/disk.conf
 %attr(755,root,root) %{_libdir}/%{name}/disk.so
+
+%if %{with dns}
+%files dns
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/dns.conf
 %attr(755,root,root) %{_libdir}/%{name}/dns.so
+%endif
+
+%files email
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/email.conf
 %attr(755,root,root) %{_libdir}/%{name}/email.so
+%{_mandir}/man5/collectd-email.5*
+
+%files entropy
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/entropy.conf
+%attr(755,root,root) %{_libdir}/%{name}/entropy.so
+
+%files exec
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/exec.conf
+%attr(755,root,root) %{_libdir}/%{name}/exec.so
+%{_mandir}/man5/collectd-exec.5*
+
+%files filecount
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/filecount.conf
+%attr(755,root,root) %{_libdir}/%{name}/filecount.so
+
+%files hddtemp
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/hddtemp.conf
 %attr(755,root,root) %{_libdir}/%{name}/hddtemp.so
+
+%files interface
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/interface.conf
+%attr(755,root,root) %{_libdir}/%{name}/interface.so
+
+%if %{with ipmi}
+%files ipmi
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/ipmi.conf
+%attr(755,root,root) %{_libdir}/%{name}/ipmi.so
+%endif
+
+%if %{with iptables}
+%files iptables
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/iptables.conf
+%attr(755,root,root) %{_libdir}/%{name}/iptables.so
+%endif
+
+%files irq
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/irq.conf
+%attr(755,root,root) %{_libdir}/%{name}/irq.so
+
+%files load
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/load.conf
 %attr(755,root,root) %{_libdir}/%{name}/load.so
+
+%files logfile
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/logfile.conf
+%attr(755,root,root) %{_libdir}/%{name}/logfile.so
+%{_var}/log/collectd.log
+
+%files match_regex
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/match_regex.conf
+%attr(755,root,root) %{_libdir}/%{name}/match_regex.so
+
+%files match_timediff
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/match_timediff.so
+
+%files match_value
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/match_value.conf
+%attr(755,root,root) %{_libdir}/%{name}/match_value.so
+
+%files mbmon
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/mbmon.conf
 %attr(755,root,root) %{_libdir}/%{name}/mbmon.so
+
+%files memcached
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/memcached.conf
+%attr(755,root,root) %{_libdir}/%{name}/memcached.so
+
+%files memory
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/memory.conf
 %attr(755,root,root) %{_libdir}/%{name}/memory.so
+
+%if %{with multimeter}
+%files multimeter
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/multimeter.conf
 %attr(755,root,root) %{_libdir}/%{name}/multimeter.so
+%endif
+
+%files mysql
+%defattr(640,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/mysql.conf
 %attr(755,root,root) %{_libdir}/%{name}/mysql.so
+
+%if %{with netlink}
+%files netlink
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/netlink.conf
+%attr(755,root,root) %{_libdir}/%{name}/netlink.so
+%endif
+
+%files network
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/network.conf
+%attr(755,root,root) %{_libdir}/%{name}/network.so
+
+%files nfs
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/nfs.conf
 %attr(755,root,root) %{_libdir}/%{name}/nfs.so
+
+%files nginx
+%defattr(640,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/nginx.conf
+%attr(755,root,root) %{_libdir}/%{name}/nginx.so
+
+%files notify_desktop
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/notify_desktop.conf
+%attr(755,root,root) %{_libdir}/%{name}/notify_desktop.so
+
+%files notify_email
+%defattr(640,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/notify_email.conf
+%attr(755,root,root) %{_libdir}/%{name}/notify_email.so
+
+%files ntpd
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/ntpd.conf
 %attr(755,root,root) %{_libdir}/%{name}/ntpd.so
+
+%files nut
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/nut.conf
+%attr(755,root,root) %{_libdir}/%{name}/nut.so
+
+%files openvpn
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/openvpn.conf
+%attr(755,root,root) %{_libdir}/%{name}/openvpn.so
+
+%files ping
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/ping.conf
 %attr(755,root,root) %{_libdir}/%{name}/ping.so
+
+%files postgresql
+%defattr(640,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/postgresql.conf
+%attr(755,root,root) %{_libdir}/%{name}/postgresql.so
+%{_datadir}/%{name}/postgresql_default.conf
+
+%files powerdns
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/powerdns.conf
+%attr(755,root,root) %{_libdir}/%{name}/powerdns.so
+
+%files processes
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/processes.conf
 %attr(755,root,root) %{_libdir}/%{name}/processes.so
+
+%files rrdtool
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/rrdtool.conf
+%attr(755,root,root) %{_libdir}/%{name}/rrdtool.so
+
+%files sensors
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/sensors.conf
 %attr(755,root,root) %{_libdir}/%{name}/sensors.so
+
+%files serial
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/serial.conf
 %attr(755,root,root) %{_libdir}/%{name}/serial.so
+
+%files snmp
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/snmp.conf
+%attr(755,root,root) %{_libdir}/%{name}/snmp.so
+%{_mandir}/man5/collectd-snmp.5*
+
+%files swap
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/swap.conf
 %attr(755,root,root) %{_libdir}/%{name}/swap.so
-%attr(755,root,root) %{_libdir}/%{name}/tape.so
-%attr(755,root,root) %{_libdir}/%{name}/traffic.so
+
+%files syslog
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/syslog.conf
+%attr(755,root,root) %{_libdir}/%{name}/syslog.so
+
+%files tail
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/tail.conf
+%attr(755,root,root) %{_libdir}/%{name}/tail.so
+
+%files target_notification
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/target_notification.conf
+%attr(755,root,root) %{_libdir}/%{name}/target_notification.so
+
+%files target_replace
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/target_replace.conf
+%attr(755,root,root) %{_libdir}/%{name}/target_replace.so
+
+%files target_set
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/target_set.conf
+%attr(755,root,root) %{_libdir}/%{name}/target_set.so
+
+%files tcpconns
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/tcpconns.conf
+%attr(755,root,root) %{_libdir}/%{name}/tcpconns.so
+
+%files teamspeak2
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/teamspeak2.conf
+%attr(755,root,root) %{_libdir}/%{name}/teamspeak2.so
+
+%files thermal
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/thermal.conf
+%attr(755,root,root) %{_libdir}/%{name}/thermal.so
+
+%files unixsock
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/unixsock.conf
+%attr(755,root,root) %{_libdir}/%{name}/unixsock.so
+%{_mandir}/man5/collectd-unixsock.5*
+
+%files users
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/users.conf
 %attr(755,root,root) %{_libdir}/%{name}/users.so
-%attr(755,root,root) %{_libdir}/%{name}/vserver.so
-%attr(755,root,root) %{_libdir}/%{name}/wireless.so
 
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
+%files uuid
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/uuid.conf
+%attr(755,root,root) %{_libdir}/%{name}/uuid.so
 
-#%attr(754,root,root) /etc/rc.d/init.d/%{name}
-#%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%files vmem
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/vmem.conf
+%attr(755,root,root) %{_libdir}/%{name}/vmem.so
 
-%{_mandir}/man1/collectd.1*
-%{_mandir}/man5/collectd.conf.5*
+%files vserver
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/vserver.conf
+%attr(755,root,root) %{_libdir}/%{name}/vserver.so
+
+%files wireless
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/wireless.conf
+%attr(755,root,root) %{_libdir}/%{name}/wireless.so
+
+%files xmms
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/xmms.conf
+%attr(755,root,root) %{_libdir}/%{name}/xmms.so