X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcollectd.git;a=blobdiff_plain;f=collectd.spec;h=0b2407bc2daa98a18a2a333facdc928745bd2324;hp=52428d0b7a50b9dcf932a16fae5604789c07e5b3;hb=876407e2b7cc8a2fd493b810fbcf52639536177c;hpb=cdf53ab5f45c7032ce3c5316028299abd771df0e

diff --git a/collectd.spec b/collectd.spec
index 52428d0..0b2407b 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -9,13 +9,27 @@
 #    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		# ???
-%bcond_without	ipmi		# ipmi plugin package
+%bcond_without	curl		# apache, ascent, bind, curl and nginx plugins
+%bcond_without	dns		# DNS plugin
+%bcond_without	ipmi		# IPMI plugin
 %bcond_without	iptables	# iptables plugin
+%bcond_without	libesmtp	# notify_email plugin
 %bcond_with	multimeter	# multimeter plugin
+%bcond_without	mysql		# MySQL plugin
 %bcond_without	netlink		# netlink plugin
+%bcond_without	notify		# notify_desktop plugin
+%bcond_without	ping		# ping plugin
+%bcond_without	psql		# PostgreSQL plugin
+%bcond_without	rrd		# rrdtool and rrdcached plugins
+%bcond_without	sensors		# sensors plugin
+%bcond_without	snmp		# SNMP plugin
+%bcond_without	ups		# nut plugin
+%bcond_without	xml		# ascent, bind and libvirt plugins
+%bcond_without	xmms		# XMMS plugin
 #
 #http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=358637
 %ifarch %{x8664}
@@ -25,102 +39,55 @@
 Summary:	Collects system information in RRD files
 Summary(pl.UTF-8):	Zbieranie informacji o systemie w plikach RRD
 Name:		collectd
-Version:	4.5.1
+Version:	4.6.2
 Release:	2
 License:	GPL v2
 Group:		Daemons
 Source0:	http://collectd.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	ab900d15662859b8793abf99eda15c29
+# Source0-md5:	9eee46a6330780d6e6b41155b159f4f9
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}-http.conf
 Source4:	%{name}-lighttpd.conf
-Source10:	%{name}-ascent.conf
-Source11:	%{name}-apache.conf
-Source12:	%{name}-dns.conf
-Source13:	%{name}-hddtemp.conf
-Source14:	%{name}-ipmi.conf
-Source15:	%{name}-mysql.conf
-Source16:	%{name}-nginx.conf
-Source17:	%{name}-notify_desktop.conf
-Source18:	%{name}-notify_email.conf
-Source19:	%{name}-nut.conf
-Source20:	%{name}-ping.conf
-Source21:	%{name}-postgresql.conf
-Source22:	%{name}-powerdns.conf
-Source23:	%{name}-rrdtool.conf
-Source24:	%{name}-sensors.conf
-Source25:	%{name}-snmp.conf
-Source26:	%{name}-uuid.conf
-Source27:	%{name}-xmms.conf
-Source28:	%{name}-tcpconns.conf
-Source29:	%{name}-teamspeak2.conf
-Source30:	%{name}-thermal.conf
-Source31:	%{name}-unixsock.conf
-Source32:	%{name}-users.conf
-Source33:	%{name}-vmem.conf
-Source34:	%{name}-vserver.conf
-Source35:	%{name}-wireless.conf
-Source36:	%{name}-apcups.conf
-Source37:	%{name}-battery.conf
-Source38:	%{name}-cpufreq.conf
-Source39:	%{name}-cpu.conf
-Source40:	%{name}-csv.conf
-Source41:	%{name}-df.conf
-Source42:	%{name}-disk.conf
-Source43:	%{name}-email.conf
-Source44:	%{name}-entropy.conf
-Source45:	%{name}-exec.conf
-Source46:	%{name}-filecount.conf
-Source47:	%{name}-interface.conf
-Source48:	%{name}-iptables.conf
-Source49:	%{name}-irq.conf
-Source51:	%{name}-load.conf
-Source52:	%{name}-logfile.conf
-Source53:	%{name}-mbmon.conf
-Source54:	%{name}-memcached.conf
-Source55:	%{name}-memory.conf
-Source56:	%{name}-multimeter.conf
-Source57:	%{name}-netlink.conf
-Source58:	%{name}-network.conf
-Source59:	%{name}-nfs.conf
-Source60:	%{name}-ntpd.conf
-Source61:	%{name}-processes.conf
-Source62:	%{name}-serial.conf
-Source63:	%{name}-swap.conf
-Source64:	%{name}-syslog.conf
-Source65:	%{name}-tail.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
+%{?with_curl:BuildRequires:	curl-devel}
+BuildRequires:	gcc-c++
+BuildRequires:	hal-devel
 %{?with_iptables:BuildRequires:	iptables-devel >= 1.4.1.1-4}
-BuildRequires:	libesmtp-devel
-BuildRequires:	libnetlink-devel
-BuildRequires:	libnotify-devel
-BuildRequires:	liboping-devel
-BuildRequires:	libpcap-devel
+BuildRequires:	libdbi-devel
+%{?with_libesmtp:BuildRequires:	libesmtp-devel}
+BuildRequires:	libltdl-devel
+%{?with_netlink:BuildRequires:	libnetlink-devel}
+%{?with_notify:BuildRequires:	libnotify-devel}
+%{?with_ping:BuildRequires:	liboping-devel}
+%{?with_dns:BuildRequires:	libpcap-devel}
 BuildRequires:	libstatgrab-devel >= 0.12
 BuildRequires:	libtool
-BuildRequires:	lm_sensors-devel
-BuildRequires:	mysql-devel
-BuildRequires:	nut-devel
+%{?with_xml:BuildRequires:	libxml2-devel}
+%{?with_sensors:BuildRequires:	lm_sensors-devel}
+%{?with_mysql:BuildRequires:	mysql-devel}
+%{?with_ups:BuildRequires:	nut-devel}
 BuildRequires:	perl-devel
+%{?with_psql:BuildRequires:	postgresql-devel}
 BuildRequires:	rpmbuild(macros) >= 1.268
-BuildRequires:	rrdtool-devel
-BuildRequires:	net-snmp-devel
-BuildRequires:	xmms-devel
+%{?with_rrd:BuildRequires:	rrdtool-devel}
+%{?with_snmp:BuildRequires:	net-snmp-devel}
+%{?with_xmms:BuildRequires:	xmms-devel}
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _pkglibdir      /var/lib/%{name}
-%define         _webapps        /etc/webapps 
-%define         _webapp         %{name}
-%define         _webappdir      %{_webapps}/%{_webapp}
-%define         _appdir         %{_datadir}/%{_webapp}
+%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
@@ -143,6 +110,29 @@ 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
@@ -184,9 +174,21 @@ Requires:	%{name} = %{version}-%{release}
 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 collectiond
-Summary(pl_PL.UTF-8):	Web script for collectiond
+Summary:	Web script for collectd
+Summary(pl_PL.UTF-8):	Web script for collectd
 Group:		Applications/WWW
 Requires:	%{name} = %{version}-%{release}
 Requires:	perl(CGI)
@@ -195,11 +197,10 @@ Requires:	perl(HTML::Entities)
 Requires:	perl(RRDs)
 Requires:	perl(URI::Escape)
 Requires:	webserver(cgi)
-# It might be not the best choice:
-Suggests:	fonts-TTF-RedHat-liberation
+Suggests:	fonts-TTF-DejaVu
 
 %description collection
-Web script for collectiond
+Web script for collectd.
 
 %package cpu
 Summary:	cpu-plugin for collectd
@@ -230,6 +231,30 @@ 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
@@ -316,6 +341,7 @@ 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
@@ -387,9 +413,35 @@ Requires:	%{name} = %{version}-%{release}
 %description logfile
 Logfile plugin for collectd.
 
-%module_scripts mbmon
+%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:	mbmon plugin for collectd
 Summary(pl_PL.UTF-8):	Wtyczka mbmon dla collectd
 Group:		Daemons
 Requires:	%{name} = %{version}-%{release}
@@ -524,6 +576,17 @@ 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
@@ -593,7 +656,6 @@ 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
@@ -634,6 +696,33 @@ 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
@@ -765,11 +854,23 @@ This plugin collectd data provided by XMMS.
 	--with-libstatgrab=/usr \
 	--with-lm-sensors=/usr \
 	--with-libmysql=/usr \
-	--%{?with_ipmi:en}%{!?with_ipmi:dis}able-ipmi \
-	--%{?with_multimeter:en}%{!?with_multimeter:dis}able-multimeter \
 	--%{?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_mysql:en}%{!?with_mysql:dis}able-mysql \
 	--%{?with_netlink:en}%{!?with_netlink:dis}able-netlink \
+	--%{?with_notify:en}%{!?with_notify:dis}able-notify_desktop \
+	--%{?with_libesmtp:en}%{!?with_libesmtp:dis}able-notify_email \
+	--%{?with_ups:en}%{!?with_ups:dis}able-nut \
+	--%{?with_ping:en}%{!?with_ping:dis}able-ping \
+	--%{?with_psql:en}%{!?with_psql:dis}able-postgresql \
+	--%{?with_rrd:en}%{!?with_rrd:dis}able-rrdtool \
+	--%{?with_sensors:en}%{!?with_sensors:dis}able-sensors \
+	--%{?with_snmp:en}%{!?with_snmp:dis}able-snmp \
+	--%{?with_xmms:en}%{!?with_xmms:dis}able-xmms \
+	%{!?with_curl:--disable-{apache,ascent,bind,curl,nginx}} \
+	%{!?with_xml:--disable-{ascent,bind,libvirt}} \
 	--disable-ipvs \
 	--disable-libvirt \
 	--disable-perl
@@ -798,63 +899,17 @@ 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
-install %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/ascent.conf
-install %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/apache.conf
-%{?with_dns:install %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/dns.conf}
-install %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/hddtemp.conf
-%{?with_ipmi:install %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/ipmi.conf}
-install %{SOURCE15} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/mysql.conf
-install %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/nginx.conf
-install %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/notify_desktop.conf
-install %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/notify_email.conf
-install %{SOURCE19} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/nut.conf
-install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/ping.conf
-install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/postgresql.conf
-install %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/powerdns.conf
-install %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/rrdtool.conf
-install %{SOURCE24} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/sensors.conf
-install %{SOURCE25} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/snmp.conf
-install %{SOURCE26} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/uuid.conf
-install %{SOURCE27} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/xmms.conf
-install %{SOURCE28} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/tcpconns.conf
-install %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/teamspeak2.conf
-install %{SOURCE30} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/thermal.conf
-install %{SOURCE31} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/unixsock.conf
-install %{SOURCE32} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/users.conf
-install %{SOURCE33} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/vmem.conf
-install %{SOURCE34} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/vserver.conf
-install %{SOURCE35} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/wireless.conf
-install %{SOURCE36} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/apcups.conf
-install %{SOURCE37} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/battery.conf
-install %{SOURCE38} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/cpufreq.conf
-install %{SOURCE39} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/cpu.conf
-install %{SOURCE40} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/csv.conf
-install %{SOURCE41} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/df.conf
-install %{SOURCE42} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/disk.conf
-install %{SOURCE43} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/email.conf
-install %{SOURCE44} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/entropy.conf
-install %{SOURCE45} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/exec.conf
-install %{SOURCE46} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/filecount.conf
-install %{SOURCE47} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/interface.conf
-%{?with_iptables:install %{SOURCE48} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/iptables.conf}
-install %{SOURCE49} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/irq.conf
-install %{SOURCE51} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/load.conf
-install %{SOURCE52} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/logfile.conf
-install %{SOURCE53} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/mbmon.conf
-install %{SOURCE54} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/memcached.conf
-install %{SOURCE55} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/memory.conf
-%{?with_multimeter:install %{SOURCE56} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/multimeter.conf}
-%{?with_netlink:install %{SOURCE57} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/netlink.conf}
-install %{SOURCE58} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/network.conf
-install %{SOURCE59} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/nfs.conf
-install %{SOURCE60} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/ntpd.conf
-install %{SOURCE61} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/processes.conf
-install %{SOURCE62} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/serial.conf
-install %{SOURCE63} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/swap.conf
-install %{SOURCE64} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/syslog.conf
-install %{SOURCE65} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.d/tail.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
@@ -872,6 +927,9 @@ 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 \
@@ -879,13 +937,16 @@ fi
 %postun %1 \
 %service %{name} restart
 
-%module_scripts apache
+%{?with_xml:%{?with_curl:%module_scripts apache}}
 %module_scripts apcups
-%module_scripts ascent
+%{?with_curl:%module_scripts ascent}
 %module_scripts battery
+%{?with_xml:%{?with_curl:%module_scripts bind}}
 %module_scripts cpufreq
 %module_scripts cpu
 %module_scripts csv
+%{?with_curl:%module_scripts curl}
+%module_scripts dbi
 %module_scripts df
 %module_scripts disk
 %{?with_dns:%module_scripts dns}
@@ -900,30 +961,37 @@ fi
 %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_mysql:%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
+%{?with_curl:%module_scripts nginx}
+%{?with_notify:%module_scripts notify_desktop}
+%{?with_libesmtp:%module_scripts notify_email}
 %module_scripts ntpd
-%module_scripts nut
-%module_scripts ping
-%module_scripts postgresql
+%{?with_ups:%module_scripts nut}
+%module_scripts openvpn
+%{?with_ping:%module_scripts ping}
+%{?with_psql:%module_scripts postgresql}
 %module_scripts powerdns
 %module_scripts processes
-%module_scripts rrdtool
-%module_scripts sensors
+%{?with_rrd:%module_scripts rrdtool}
+%{?with_sensors:%module_scripts sensors}
 %module_scripts serial
-%module_scripts snmp
+%{?with_snmp:%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
@@ -933,7 +1001,7 @@ fi
 %module_scripts vmem
 %module_scripts vserver
 %module_scripts wireless
-%module_scripts xmms
+%{?with_xmms:%module_scripts xmms}
 
 %triggerin collection -- apache1 < 1.3.37-3, apache1-base
 %webapp_register apache %{_webapp}
@@ -947,10 +1015,10 @@ fi
 %triggerun collection -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-%triggerin -- lighttpd
+%triggerin collection -- lighttpd
 %webapp_register lighttpd %{_webapp}
 
-%triggerun -- lighttpd
+%triggerun collection -- lighttpd
 %webapp_unregister lighttpd %{_webapp}
 
 %files
@@ -961,8 +1029,8 @@ fi
 %attr(755,root,root) %{_sbindir}/collectd
 %attr(755,root,root) %{_sbindir}/collectdmon
 %attr(755,root,root) %{_bindir}/collectd-nagios
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/types.db
+%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*
@@ -970,9 +1038,22 @@ fi
 %{_mandir}/man5/collectd-perl.5*
 %{_mandir}/man1/collectdmon.1*
 %{_mandir}/man5/types.db.5*
-%{_var}/log/collectd.log
 %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}
@@ -985,26 +1066,41 @@ fi
 %attr(755,root,root) %{_appdir}/cgi-bin/collection.cgi
 
 ########## PLUGINS:
+%if %{with xml}
+%if %{with curl}
+%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
+%endif
+%endif
+
 %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
 
+%if %{with curl}
 %files ascent
-%defattr(644,root,root,755)
+%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 apache
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/apache.conf
-%attr(755,root,root) %{_libdir}/%{name}/apache.so
+%endif
 
 %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
 
+%if %{with xml}
+%if %{with curl}
+%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
+%endif
+%endif
+
 %files cpu
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/cpu.conf
@@ -1020,6 +1116,18 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/csv.conf
 %attr(755,root,root) %{_libdir}/%{name}/csv.so
 
+%if %{with curl}
+%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
+%endif
+
+%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
@@ -1030,10 +1138,12 @@ fi
 %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)
@@ -1095,6 +1205,21 @@ fi
 %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)
@@ -1118,10 +1243,12 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/multimeter.so
 %endif
 
+%if %{with mysql}
 %files mysql
-%defattr(644,root,root,755)
+%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
+%endif
 
 %if %{with netlink}
 %files netlink
@@ -1140,40 +1267,58 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/nfs.conf
 %attr(755,root,root) %{_libdir}/%{name}/nfs.so
 
+%if %{with curl}
 %files nginx
-%defattr(644,root,root,755)
+%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
+%endif
 
+%if %{with notify}
 %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
+%endif
 
+%if %{with libesmtp}
 %files notify_email
-%defattr(644,root,root,755)
+%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
+%endif
 
 %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
 
+%if %{with ups}
 %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
+%endif
+
+%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
 
+%if %{with ping}
 %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
+%endif
 
+%if %{with psql}
 %files postgresql
-%defattr(644,root,root,755)
+%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
+%endif
 
 %files powerdns
 %defattr(644,root,root,755)
@@ -1185,26 +1330,32 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/processes.conf
 %attr(755,root,root) %{_libdir}/%{name}/processes.so
 
+%if %{with rrd}
 %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
+%endif
 
+%if %{with sensors}
 %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
+%endif
 
 %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
 
+%if %{with snmp}
 %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*
+%endif
 
 %files swap
 %defattr(644,root,root,755)
@@ -1221,6 +1372,21 @@ fi
 %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
@@ -1267,7 +1433,9 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/wireless.conf
 %attr(755,root,root) %{_libdir}/%{name}/wireless.so
 
+%if %{with xmms}
 %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
+%endif