SPECS: collectd.spec - lighttpd support added - rel 0.4

[luzik]

Author: luzik                        Date: Tue May 27 10:57:33 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- lighttpd support added
- rel 0.4

---- Files affected:
SPECS:
   collectd.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/collectd.spec
diff -u SPECS/collectd.spec:1.23 SPECS/collectd.spec:1.24
--- SPECS/collectd.spec:1.23	Tue May 27 08:04:52 2008
+++ SPECS/collectd.spec	Tue May 27 12:57:28 2008
@@ -65,7 +65,7 @@
 Summary(pl.UTF-8):	Zbieranie informacji o systemie w plikach RRD
 Name:		collectd
 Version:	4.4.0
-Release:	0.3
+Release:	0.4
 License:	GPL v2
 Group:		Daemons
 Source0:	http://collectd.org/files/%{name}-%{version}.tar.gz
@@ -136,13 +136,26 @@
 Wtyczka collectd zbierająca informacje udostępniane przez moduł
 'mod_status' Apacha.
 
-%package collection
+%package collection-apache
 Summary:	Web script for collectiond
 Summary(pl_PL.UTF-8):	Web script for collectiond
 Group:		Applications/WWW
 Requires:	%{name} = %{version}-%{release}
+Requires:	perl-HTML-Parser
+Requires:	perl-URI
 
-%description collection
+%description collection-apache
+Web script for collectiond
+
+%package collection-lighttpd
+Summary:	Web script for collectiond
+Summary(pl_PL.UTF-8):	Web script for collectiond
+Group:		Applications/WWW
+Requires:	%{name} = %{version}-%{release}
+Requires:	perl-HTML-Parser
+Requires:	perl-URI
+
+%description collection-lighttpd
 Web script for collectiond
 
 %package dns
@@ -246,6 +259,11 @@
 %prep
 %setup -q
 
+cat >> collection.conf <<'EOF'
+datadir: "/var/lib/collectd/"
+libdir: "/usr/lib/collectd/"
+EOF
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -264,14 +282,16 @@
 %{__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/home/services/{httpd,lighttpd}/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 collection.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install contrib/collection.cgi $RPM_BUILD_ROOT/home/services/httpd/cgi-bin
+install contrib/collection.cgi $RPM_BUILD_ROOT/home/services/lighttpd/cgi-bin
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 
@@ -364,11 +384,16 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/apache.so
 
-%files collection
+%files collection-apache
 %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
 
+%files collection-lighttpd
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/collection.conf
+%attr(755,root,root) /home/services/lighttpd/cgi-bin/collection.cgi
+
 %files dns
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/dns.so
@@ -415,6 +440,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2008-05-27 10:57:28  luzik
+- lighttpd support added
+- rel 0.4
+
 Revision 1.23  2008-05-27 06:04:52  glen
 - newline
 
================================================================

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