SPECS: collectd.spec - rel.2 - collection.patch added (proper cgi configura...

[blues]

Author: blues                        Date: Sun Nov  2 23:11:30 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel.2 - collection.patch added (proper cgi configuration); lighttpd
  webapp simple config.

---- Files affected:
SPECS:
   collectd.spec (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: SPECS/collectd.spec
diff -u SPECS/collectd.spec:1.47 SPECS/collectd.spec:1.48
--- SPECS/collectd.spec:1.47	Sun Nov  2 22:16:35 2008
+++ SPECS/collectd.spec	Mon Nov  3 00:11:24 2008
@@ -27,7 +27,7 @@
 Summary(pl.UTF-8):	Zbieranie informacji o systemie w plikach RRD
 Name:		collectd
 Version:	4.5.1
-Release:	1.5
+Release:	2
 License:	GPL v2
 Group:		Daemons
 Source0:	http://collectd.org/files/%{name}-%{version}.tar.gz
@@ -35,6 +35,7 @@
 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
@@ -90,6 +91,7 @@
 Source63:	%{name}-swap.conf
 Source64:	%{name}-syslog.conf
 Source65:	%{name}-tail.conf
+Patch0:		%{name}-collection.patch
 URL:		http://collectd.org/
 %{?with_ipmi:BuildRequires:	OpenIPMI-devel >= 2.0.14-3}
 BuildRequires:	autoconf
@@ -188,6 +190,14 @@
 Summary(pl_PL.UTF-8):	Web script for collectiond
 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)
+# It might be not the best choice:
+Suggests:	fonts-TTF-RedHat-liberation
 
 %description collection
 Web script for collectiond
@@ -743,11 +753,7 @@
 
 %prep
 %setup -q
-
-cat >> collection.conf <<'EOF'
-datadir: "/var/lib/collectd/"
-libdir: "/usr/lib/collectd/"
-EOF
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -790,6 +796,7 @@
 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 ###
 # Example config in sources: src/collectd.conf
@@ -941,6 +948,12 @@
 %triggerun collection -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
+%triggerin -- lighttpd
+%webapp_register lighttpd %{_webapp}
+
+%triggerun -- lighttpd
+%webapp_unregister lighttpd %{_webapp}
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO contrib
@@ -967,6 +980,7 @@
 %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
@@ -1265,6 +1279,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2008/11/02 23:11:24  blues
+- rel.2 - collection.patch added (proper cgi configuration); lighttpd
+  webapp simple config.
+
 Revision 1.47  2008/11/02 21:16:35  blues
 - massive attack - every plugin in separate package. Needs testing.
 
================================================================

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