- drop cron support; add Requires: cacti so cacti will run cactid on it's own

Changed files:
    cacti-spine.spec -> 1.5

diff --git a/cacti-spine.spec b/cacti-spine.spec
index 18e792147558b996c4038827e51d0c16c22b05f4..d5343e97912baf69cae09f725fb9062326f7efd2 100644 (file)
--- a/cacti-spine.spec
+++ b/cacti-spine.spec
@@ -1,7 +1,7 @@
 Summary:       A backend data gatherer for cacti
 Name:          cacti-cactid
 Version:       0.8.6f
-Release:       0.1
+Release:       0.2
 License:       GPL
 Group:         Applications
 Source0:       http://www.cacti.net/downloads/cactid/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@ BuildRequires:        mysql-devel
 BuildRequires: net-snmp-devel
 BuildRequires: openssl-devel
 BuildRequires: zlib-devel
+Requires:      cacti
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -31,17 +32,12 @@ install /usr/share/automake/config.* config
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install cactid.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
-cat  << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name}
-*/5 * * * * nobody umask 022; /usr/bin/cactid > /dev/null 2>&1
-EOF
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -49,5 +45,4 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc CHANGELOG README
 %attr(755,root,root) %{_bindir}/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cactid.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cactid.conf