SPECS: collectd.spec - added curl, libesmtp, mysql, notify, ping, psql, rrd...

gotar gotar at pld-linux.org
Mon Mar 30 03:02:20 CEST 2009 

Author: gotar                        Date: Mon Mar 30 01:02:20 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added curl, libesmtp, mysql, notify, ping, psql, rrd, sensors, snmp, ups,
  xml and xmms bconds, cleanup %module_scripts serial

---- Files affected:
SPECS:
   collectd.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: SPECS/collectd.spec
diff -u SPECS/collectd.spec:1.64 SPECS/collectd.spec:1.65
--- SPECS/collectd.spec:1.64	Mon Mar 30 02:52:08 2009
+++ SPECS/collectd.spec	Mon Mar 30 03:02:15 2009
@@ -14,11 +14,23 @@
 # - %desc -l pl for plugins
 #
 # Conditional build:
+%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}
@@ -45,29 +57,29 @@
 %{?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:	libdbi-devel
-BuildRequires:	libesmtp-devel
+%{?with_libesmtp:BuildRequires:	libesmtp-devel}
 BuildRequires:	libltdl-devel
 %{?with_netlink:BuildRequires:	libnetlink-devel}
-BuildRequires:	libnotify-devel
-BuildRequires:	liboping-devel
+%{?with_notify:BuildRequires:	libnotify-devel}
+%{?with_ping:BuildRequires:	liboping-devel}
 %{?with_dns:BuildRequires:	libpcap-devel}
 BuildRequires:	libstatgrab-devel >= 0.12
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel
-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
-BuildRequires:	postgresql-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)
@@ -645,7 +657,6 @@
 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
@@ -848,7 +859,19 @@
 	--%{?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-rrd{cached,tool} \
+	--%{?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,libvirt}} \
 	--disable-ipvs \
 	--disable-libvirt \
 	--disable-perl
@@ -915,15 +938,15 @@
 %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
-%module_scripts bind
+%{?with_xml:%{?with_curl:%module_scripts bind}}
 %module_scripts cpufreq
 %module_scripts cpu
 %module_scripts csv
-%module_scripts curl
+%{?with_curl:%module_scripts curl}
 %module_scripts dbi
 %module_scripts df
 %module_scripts disk
@@ -946,24 +969,24 @@
 %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
+%{?with_ups:%module_scripts nut}
 %module_scripts openvpn
-%module_scripts ping
-%module_scripts postgresql
+%{?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
@@ -979,7 +1002,7 @@
 %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}
@@ -1044,30 +1067,40 @@
 %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(640,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.d/ascent.conf
 %attr(755,root,root) %{_libdir}/%{name}/ascent.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)
@@ -1084,10 +1117,12 @@
 %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)
@@ -1209,10 +1244,12 @@
 %attr(755,root,root) %{_libdir}/%{name}/multimeter.so
 %endif
 
+%if %{with mysql}
 %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
+%endif
 
 %if %{with netlink}
 %files netlink
@@ -1231,46 +1268,58 @@
 %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(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(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(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)
@@ -1282,26 +1331,32 @@
 %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)
@@ -1379,10 +1434,12 @@
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -1390,6 +1447,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2009/03/30 01:02:15  gotar
+- added curl, libesmtp, mysql, notify, ping, psql, rrd, sensors, snmp, ups,
+  xml and xmms bconds, cleanup %module_scripts serial
+
 Revision 1.64  2009/03/30 00:52:08  gotar
 - added missing BRs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/collectd.spec?r1=1.64&r2=1.65&f=u

More information about the pld-cvs-commit mailing list