X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcollectd.git;a=blobdiff_plain;f=collectd.spec;h=b8b2ff0bf7fab6dc5ed8e3efda508c1bef7d0ab3;hp=989e862d2b1d4ff7fff233d9013f1b6963964359;hb=9bf346e3cab2229d20150ee83e62fbc08314ad01;hpb=4929f1a76fc169438c39064fd094cce30c6777c5

diff --git a/collectd.spec b/collectd.spec
index 989e862..b8b2ff0 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -10,6 +10,7 @@
 #    perl  . . . . . . . no		(needs libperl)
 #    tape  . . . . . . . no		?
 # - logrotate file for logfile plugin
+# - %desc -l pl for plugins
 #
 # Conditional build:
 %bcond_without	dns		# ???
@@ -26,12 +27,12 @@
 Summary:	Collects system information in RRD files
 Summary(pl.UTF-8):	Zbieranie informacji o systemie w plikach RRD
 Name:		collectd
-Version:	4.5.1
-Release:	2.1
+Version:	4.5.2
+Release:	1
 License:	GPL v2
 Group:		Daemons
 Source0:	http://collectd.org/files/%{name}-%{version}.tar.gz
-# Source0-md5:	ab900d15662859b8793abf99eda15c29
+# Source0-md5:	464f44da322f78dcc9c12eeb52d3ad8d
 Source1:	%{name}.conf
 Source2:	%{name}.init
 Source3:	%{name}-http.conf
@@ -44,6 +45,7 @@ URL:		http://collectd.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	curl-devel
+BuildRequires:	hal-devel
 %{?with_iptables:BuildRequires:	iptables-devel >= 1.4.1.1-4}
 BuildRequires:	libesmtp-devel
 BuildRequires:	libnetlink-devel
@@ -52,10 +54,12 @@ BuildRequires:	liboping-devel
 BuildRequires:	libpcap-devel
 BuildRequires:	libstatgrab-devel >= 0.12
 BuildRequires:	libtool
+BuildRequires:	libxml2-devel
 BuildRequires:	lm_sensors-devel
 BuildRequires:	mysql-devel
 BuildRequires:	nut-devel
 BuildRequires:	perl-devel
+BuildRequires:	postgresql-devel
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	rrdtool-devel
 BuildRequires:	net-snmp-devel
@@ -64,11 +68,11 @@ 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
@@ -133,8 +137,8 @@ This plugin collects the battery's charge, the drawn current and the
 battery's voltage.
 
 %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)
@@ -143,11 +147,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
@@ -264,6 +267,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
@@ -849,10 +853,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