[packages/sysstat] - use crontab supplied by upstream - rel 2

[baggins]

commit b9d8097994c7818cf4ffdc96cc9cf52e8da4f671
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date:   Sat Aug 17 10:30:15 2013 +0200

    - use crontab supplied by upstream
    - rel 2

 sysstat.crond |  7 -------
 sysstat.spec  | 10 +++++++---
 2 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/sysstat.spec b/sysstat.spec
index c5c751f..e381758 100644
--- 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}
diff --git a/sysstat.crond b/sysstat.crond
deleted file mode 100644
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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sysstat.git/commitdiff/b9d8097994c7818cf4ffdc96cc9cf52e8da4f671

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit