SPECS: collectd.spec - revert: have look at template-webapp.spec how to do ...

[glen]

Author: glen                         Date: Tue May 27 11:12:32 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- revert: have look at template-webapp.spec how to do it with single package with webapps framework

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

---- Diffs:

================================================================
Index: SPECS/collectd.spec
diff -u SPECS/collectd.spec:1.24 SPECS/collectd.spec:1.25
--- SPECS/collectd.spec:1.24	Tue May 27 12:57:28 2008
+++ SPECS/collectd.spec	Tue May 27 13:12:26 2008
@@ -136,26 +136,13 @@
 Wtyczka collectd zbierająca informacje udostępniane przez moduł
 'mod_status' Apacha.
 
-%package collection-apache
+%package collection
 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-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
+%description collection
 Web script for collectiond
 
 %package dns
@@ -282,16 +269,14 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-
 install -d $RPM_BUILD_ROOT%{_var}/{log/,lib/%{name}}
-install -d $RPM_BUILD_ROOT/home/services/{httpd,lighttpd}/cgi-bin
+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 collection.conf $RPM_BUILD_ROOT%{_sysconfdir}
+install contrib/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}
 
@@ -384,16 +369,11 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/apache.so
 
-%files collection-apache
+%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
 
-%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
@@ -440,6 +420,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2008-05-27 11:12:26  glen
+- revert: have look at template-webapp.spec how to do it with single package with webapps framework
+
 Revision 1.24  2008-05-27 10:57:28  luzik
 - lighttpd support added
 - rel 0.4
================================================================

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