- use crontab supplied by upstream

- rel 2

diff --git a/sysstat.crond b/sysstat.crond
deleted file mode 100644 (file)
index ad22e35..0000000
--- a/sysstat.crond
+++ /dev/null
@@ -1,7 +0,0 @@
-MAILTO=root
-
-# activity reports every 10 minutes everyday.
-0  * * * * root exec /usr/lib/sa/sa1 600 6
-
-# Daily summary prepared at 19:05.
-5 19 * * * root exec /usr/lib/sa/sa2 -A

diff --git a/sysstat.spec b/sysstat.spec
index c5c751f5b7092c57457b7b5986a120c2fb8c2053..e3817586190614a532e5ac51e9618d4efbf88047 100644 (file)
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -5,12 +5,11 @@ Summary(uk.UTF-8):    Містить команди системного моніт
 Summary(zh_CN.UTF-8):  sar, iostat 等系统监视工具
 Name:          sysstat
 Version:       10.1.6
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://perso.wanadoo.fr/sebastien.godard/%{name}-%{version}.tar.bz2
 # Source0-md5: 61792b2591e4b3adcb7b979af2330fba
-Source1:       %{name}.crond
 Source2:       %{name}.init
 Patch0:                %{name}-opt.patch
 URL:           http://perso.wanadoo.fr/sebastien.godard/
@@ -61,6 +60,9 @@ sieciowych i innych operacji wejścia/wyjścia.
 %configure \
        history=28 \
        compressafter=31 \
+       cron_owner=root \
+       cron_interval=10 \
+       --enable-install-cron \
        --disable-stripping \
        --with-systemdsystemunitdir=%{systemdunitdir}
 
@@ -75,11 +77,13 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{cron.d,rc.d/init.d,sysconfig},/var/log/sa,%{systemdunitdir}}
 
 %{__make} install \
+       CHOWN=/bin/true \
+       SYSTEMCTL=/bin/true \
+       SYSTEMD_UNIT_DIR=$RPM_BUILD_ROOT%{systemdunitdir} \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -p sysstat.service $RPM_BUILD_ROOT%{systemdunitdir}
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.d/sysstat
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/sysstat
 
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}