- webapps started

[packages/collectd.git] / collectd.spec

diff --git a/collectd.spec b/collectd.spec
index 831f4de4ff85572de1e14ffbfca7cddebb7dcfde..2d167b983a510d83a2f335f4e017f5eee08db9dc 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -92,6 +92,12 @@ 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.
@@ -135,26 +141,13 @@ This plugin collectd data provided by Apache's `mod_status'.
 Wtyczka collectd zbierająca informacje udostępniane przez moduł
 'mod_status' Apacha.
 
-%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-apache
-Web script for collectiond
-
-%package collection-lighttpd
+%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-lighttpd
+%description collection
 Web script for collectiond
 
 %package dns
@@ -281,16 +274,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__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}
 
@@ -383,16 +374,11 @@ fi
 %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