SPECS: collectd.spec - webapps support
blues
blues at pld-linux.org
Wed May 28 11:43:43 CEST 2008
Author: blues Date: Wed May 28 09:43:43 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- webapps support
---- Files affected:
SPECS:
collectd.spec (1.26 -> 1.27)
---- Diffs:
================================================================
Index: SPECS/collectd.spec
diff -u SPECS/collectd.spec:1.26 SPECS/collectd.spec:1.27
--- SPECS/collectd.spec:1.26 Wed May 28 10:56:31 2008
+++ SPECS/collectd.spec Wed May 28 11:43:37 2008
@@ -65,13 +65,14 @@
Summary(pl.UTF-8): Zbieranie informacji o systemie w plikach RRD
Name: collectd
Version: 4.4.0
-Release: 0.4
+Release: 0.5
License: GPL v2
Group: Daemons
Source0: http://collectd.org/files/%{name}-%{version}.tar.gz
# Source0-md5: a677ddcad97fdb3cdd09efac4842b11d
Source1: %{name}.conf
Source2: %{name}.init
+Source3: %{name}-http.conf
URL: http://collectd.org/
BuildRequires: OpenIPMI-devel
BuildRequires: autoconf
@@ -271,21 +272,26 @@
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_var}/{log/,lib/%{name}},/etc/rc.d/init.d/} \
+ $RPM_BUILD_ROOT{%{_appdir}/cgi-bin,%{_webappdir},%{_pkglibdir}}
%{__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/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 contrib/collection.cgi $RPM_BUILD_ROOT/home/services/httpd/cgi-bin
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+# Web frontend:
+install contrib/collection.conf $RPM_BUILD_ROOT%{_webappdir}
+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
+
+# Cleanups:
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -299,6 +305,18 @@
/sbin/chkconfig --del %{name}
fi
+%triggerin collection -- apache1 < 1.3.37-3, apache1-base
+%webapp_register apache %{_webapp}
+
+%triggerun collection -- apache1 < 1.3.37-3, apache1-base
+%webapp_unregister apache %{_webapp}
+
+%triggerin collection -- apache < 2.2.0, apache-base
+%webapp_register httpd %{_webapp}
+
+%triggerun collection -- apache < 2.2.0, apache-base
+%webapp_unregister httpd %{_webapp}
+
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README TODO contrib
@@ -377,8 +395,10 @@
%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
+%config(noreplace) %verify(not md5 mtime size) %{_webappdir}/collection.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
+%attr(755,root,root) %{_appdir}/cgi-bin/collection.cgi
%files dns
%defattr(644,root,root,755)
@@ -426,6 +446,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2008-05-28 09:43:37 blues
+- webapps support
+
Revision 1.26 2008-05-28 08:56:31 blues
- webapps started
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/collectd.spec?r1=1.26&r2=1.27&f=u
More information about the pld-cvs-commit
mailing list