- webapps started

[packages/collectd.git] / collectd.spec

diff --git a/collectd.spec b/collectd.spec
index 34683d28bd17343c5c4ee6ddf741a0dbf4a313ed..2d167b983a510d83a2f335f4e017f5eee08db9dc 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,7 +1,6 @@
 # TODO:
 # - lm_sensors subpackage
 # - initscripts for local/client/server mode (subpackage ?)
-# - collection CGI script
 # - package contrib scripts as %doc
 # - put every plugin into subpackages
 # - Current plugins status:
@@ -65,12 +64,13 @@ Summary:    Collects system information in RRD files
 Summary(pl.UTF-8):     Zbieranie informacji o systemie w plikach RRD
 Name:          collectd
 Version:       4.4.0
-Release:       0.2
+Release:       0.4
 License:       GPL v2
 Group:         Daemons
 Source0:       http://collectd.org/files/%{name}-%{version}.tar.gz
 # Source0-md5: a677ddcad97fdb3cdd09efac4842b11d
 Source1:       %{name}.conf
+Source2:       %{name}.init
 URL:           http://collectd.org/
 BuildRequires: OpenIPMI-devel
 BuildRequires: autoconf
@@ -78,19 +78,26 @@ BuildRequires:      automake
 BuildRequires: curl-devel
 BuildRequires: iptables-devel
 BuildRequires: libnetlink-devel
-# External package needed (http://verplant.org/liboping/)
-#BuildRequires:        liboping-devel
+BuildRequires: liboping-devel
 BuildRequires: libpcap-devel
 BuildRequires: libstatgrab-devel >= 0.12
 BuildRequires: libtool
+BuildRequires: lm_sensors-devel
 BuildRequires: mysql-devel
 BuildRequires: perl-devel
-BuildRequires: rpmbuild(macros) >= 1.228
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: rrdtool-devel
 BuildRequires: xmms-devel
 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.
@@ -134,11 +141,21 @@ This plugin collectd data provided by Apache's `mod_status'.
 Wtyczka collectd zbierająca informacje udostępniane przez moduł
 'mod_status' Apacha.
 
+%package collection
+Summary:       Web script for collectiond
+Summary(pl_PL.UTF-8):  Web script for collectiond
+Group:         Applications/WWW
+Requires:      %{name} = %{version}-%{release}
+
+%description collection
+Web script for collectiond
+
 %package dns
 Summary:       dns-plugin for collectd
 Summary(pl_PL.UTF-8):  Wtyczka dns dla collectd
 Group:         Daemons
 Requires:      %{name} = %{version}-%{release}
+Requires:      perl-rrdtool
 
 %description dns
 dns plugin for collectd.
@@ -175,6 +192,15 @@ Requires:  %{name} = %{version}-%{release}
 %description nginx
 nginx plugin for collectd.
 
+%package ping
+Summary:       ping-plugin for collectd
+Summary(pl_PL.UTF-8):  Wtyczka ping dla collectd
+Group:         Daemons
+Requires:      %{name} = %{version}-%{release}
+
+%description ping
+ping plugin for collectd.
+
 %package rrdtool
 Summary:       rrdtool-plugin for collectd
 Summary(pl_PL.UTF-8):  Wtyczka rrdtool dla collectd
@@ -225,6 +251,11 @@ This plugin collectd data provided by XMMS.
 %prep
 %setup -q
 
+cat >> collection.conf <<'EOF'
+datadir: "/var/lib/collectd/"
+libdir: "/usr/lib/collectd/"
+EOF
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -234,7 +265,7 @@ This plugin collectd data provided by XMMS.
 %configure \
        --with-libstatgrab=/usr \
        --with-lm-sensors=/usr \
-       --with-libmysql=/usr 
+       --with-libmysql=/usr
 %{__make} LDFLAGS="%{rpmldflags} -lstatgrab"
 
 %install
@@ -244,11 +275,15 @@ rm -rf $RPM_BUILD_ROOT
        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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -296,7 +331,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/nfs.so
 %attr(755,root,root) %{_libdir}/%{name}/ntpd.so
 #%attr(755,root,root) %{_libdir}/%{name}/perl.so
-%attr(755,root,root) %{_libdir}/%{name}/ping.so
 %attr(755,root,root) %{_libdir}/%{name}/powerdns.so
 %attr(755,root,root) %{_libdir}/%{name}/processes.so
 %attr(755,root,root) %{_libdir}/%{name}/serial.so
@@ -316,8 +350,7 @@ fi
 
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 
-#%attr(754,root,root) /etc/rc.d/init.d/%{name}
-#%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
 
 %{_mandir}/man1/collectd.1*
 %{_mandir}/man1/collectd-nagios.1*
@@ -341,6 +374,11 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/apache.so
 
+%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 dns
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/dns.so
@@ -357,6 +395,10 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/nginx.so
 
+%files ping
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/ping.so
+
 %files rrdtool
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/rrdtool.so