X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcollectd.git;a=blobdiff_plain;f=collectd.spec;h=fe744a172016ce2e1ac00578b0d7e65dae09f4c2;hp=f7557f15af9a6bd122b9b22b8a45a84a535b55e6;hb=0b998ec1690d0ffab0c06d91448f266c66eccbc1;hpb=ef79d9eada7dd3d8a4ac63db17a0ac436fd4466d

diff --git a/collectd.spec b/collectd.spec
index f7557f1..fe744a1 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,6 +1,5 @@
 # TODO:
 # - lm_sensors subpackage
-# - initscripts for local/client/server mode (subpackage ?)
 # - package contrib scripts as %doc
 # - put every plugin into subpackages
 # - Current plugins status:
@@ -21,7 +20,7 @@
 #    hddtemp . . . . . . yes
 #    interface . . . . . yes
 #    iptables  . . . . . yes
-#    ipmi  . . . . . . . no
+#    ipmi  . . . . . . . yes
 #    ipvs  . . . . . . . no (ip_vs.h not found)
 #    irq . . . . . . . . yes
 #    libvirt . . . . . . no
@@ -30,14 +29,14 @@
 #    mbmon . . . . . . . yes
 #    memcached . . . . . yes
 #    memory  . . . . . . yes
-#    multimeter  . . . . yes
+#    multimeter  . . . . no
 #    mysql . . . . . . . yes
 #    netlink . . . . . . yes
 #    network . . . . . . yes
 #    nfs . . . . . . . . yes
 #    nginx . . . . . . . yes
 #    ntpd  . . . . . . . yes
-#    nut . . . . . . . . no
+#    nut . . . . . . . . yes
 #    perl  . . . . . . . no (needs libperl)
 #    ping  . . . . . . . yes
 #    powerdns  . . . . . yes
@@ -59,39 +58,62 @@
 #    vserver . . . . . . yes
 #    wireless  . . . . . yes
 #    xmms  . . . . . . . yes
-
+#
+# Conditional build:
+%bcond_without	dns		# ???
+%bcond_without	ipmi		# ipmi plugin package
+%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:	4.4.0
-Release:	0.3
+Version:	4.5.0
+Release:	1
 License:	GPL v2
 Group:		Daemons
 Source0:	http://collectd.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	a677ddcad97fdb3cdd09efac4842b11d
+# Source0-md5:	f73dbadc8dca136b98c0f96567e0f78c
 Source1:	%{name}.conf
 Source2:	%{name}.init
+Source3:	%{name}-http.conf
 URL:		http://collectd.org/
 BuildRequires:	OpenIPMI-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	curl-devel
 BuildRequires:	iptables-devel
+BuildRequires:	libesmtp-devel
 BuildRequires:	libnetlink-devel
+BuildRequires:	libnotify-devel
 BuildRequires:	liboping-devel
 BuildRequires:	libpcap-devel
 BuildRequires:	libstatgrab-devel >= 0.12
 BuildRequires:	libtool
 BuildRequires:	lm_sensors-devel
 BuildRequires:	mysql-devel
+BuildRequires:	nut-devel
 BuildRequires:	perl-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      /var/lib/%{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.
@@ -163,6 +185,18 @@ Requires:	%{name} = %{version}-%{release}
 %description hddtemp
 hddtemp plugin for collectd.
 
+%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 mysql
 Summary:	mysql-plugin for collectd
 Summary(pl_PL.UTF-8):	Moduł mysql dla collectd.
@@ -195,6 +229,15 @@ Requires:	%{name} = %{version}-%{release}
 %description ping
 ping plugin for collectd.
 
+%package powerdns
+Summary:	powerdns-plugin for collectd
+Summary(pl_PL.UTF-8):	Wtyczka powerdns dla collectd
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description powerdns
+powerdns plugin for collectd.
+
 %package rrdtool
 Summary:	rrdtool-plugin for collectd
 Summary(pl_PL.UTF-8):	Wtyczka rrdtool dla collectd
@@ -245,35 +288,55 @@ This plugin collectd data provided by XMMS.
 %prep
 %setup -q
 
+cat >> collection.conf <<'EOF'
+datadir: "/var/lib/collectd/"
+libdir: "/usr/lib/collectd/"
+EOF
+
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+
 %configure \
 	--with-libstatgrab=/usr \
 	--with-lm-sensors=/usr \
-	--with-libmysql=/usr
-%{__make} LDFLAGS="%{rpmldflags} -lstatgrab"
+	--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_iptables:en}%{!?with_iptables:dis}able-iptables \
+	--%{?with_netlink:en}%{!?with_netlink:dis}able-netlink
+
+
+%{__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/} \
+	$RPM_BUILD_ROOT{%{_appdir}/cgi-bin,%{_webappdir},%{_pkglibdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_var}/{log/,lib/%{name}}
-install -d $RPM_BUILD_ROOT/home/services/httpd/cgi-bin
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d/
 #install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/collectd.conf
 touch $RPM_BUILD_ROOT%{_var}/log/collectd.log
 install src/collectd.conf $RPM_BUILD_ROOT%{_sysconfdir}/collectd.conf
-install contrib/collection.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install contrib/collection.cgi $RPM_BUILD_ROOT/home/services/httpd/cgi-bin
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 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
+
+# Cleanups:
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -287,6 +350,18 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del %{name}
 fi
 
+%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}
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO contrib
@@ -306,21 +381,32 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/email.so
 %attr(755,root,root) %{_libdir}/%{name}/entropy.so
 %attr(755,root,root) %{_libdir}/%{name}/exec.so
+%attr(755,root,root) %{_libdir}/%{name}/filecount.so
 %attr(755,root,root) %{_libdir}/%{name}/interface.so
+%if %{with iptables}
 %attr(755,root,root) %{_libdir}/%{name}/iptables.so
+%endif
+%attr(755,root,root) %{_libdir}/%{name}/ipvs.so
 %attr(755,root,root) %{_libdir}/%{name}/irq.so
 %attr(755,root,root) %{_libdir}/%{name}/load.so
 %attr(755,root,root) %{_libdir}/%{name}/logfile.so
 %attr(755,root,root) %{_libdir}/%{name}/mbmon.so
+%attr(755,root,root) %{_libdir}/%{name}/notify_desktop.so
+%attr(755,root,root) %{_libdir}/%{name}/notify_email.so
 %attr(755,root,root) %{_libdir}/%{name}/memcached.so
 %attr(755,root,root) %{_libdir}/%{name}/memory.so
+%if %{with multimeter}
 %attr(755,root,root) %{_libdir}/%{name}/multimeter.so
+%endif
+%if %{with netlink}
 %attr(755,root,root) %{_libdir}/%{name}/netlink.so
+%endif
 %attr(755,root,root) %{_libdir}/%{name}/network.so
+%attr(755,root,root) %{_libdir}/%{name}/nut.so
 %attr(755,root,root) %{_libdir}/%{name}/nfs.so
 %attr(755,root,root) %{_libdir}/%{name}/ntpd.so
 #%attr(755,root,root) %{_libdir}/%{name}/perl.so
-%attr(755,root,root) %{_libdir}/%{name}/powerdns.so
+%attr(755,root,root) %{_libdir}/%{name}/postgresql.so
 %attr(755,root,root) %{_libdir}/%{name}/processes.so
 %attr(755,root,root) %{_libdir}/%{name}/serial.so
 %attr(755,root,root) %{_libdir}/%{name}/swap.so
@@ -329,6 +415,7 @@ fi
 #%attr(755,root,root) %{_libdir}/%{name}/tape.so
 %attr(755,root,root) %{_libdir}/%{name}/teamspeak2.so
 %attr(755,root,root) %{_libdir}/%{name}/tcpconns.so
+%attr(755,root,root) %{_libdir}/%{name}/thermal.so
 #%attr(755,root,root) %{_libdir}/%{name}/traffic.so
 %attr(755,root,root) %{_libdir}/%{name}/unixsock.so
 %attr(755,root,root) %{_libdir}/%{name}/users.so
@@ -365,8 +452,10 @@ fi
 
 %files collection
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/collection.conf
-%attr(755,root,root) /home/services/httpd/cgi-bin/collection.cgi
+%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(755,root,root) %{_appdir}/cgi-bin/collection.cgi
 
 %files dns
 %defattr(644,root,root,755)
@@ -376,6 +465,12 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/hddtemp.so
 
+%if %{with ipmi}
+%files ipmi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/ipmi.so
+%endif
+
 %files mysql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/mysql.so
@@ -388,6 +483,10 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/ping.so
 
+%files powerdns
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/powerdns.so
+
 %files rrdtool
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/rrdtool.so