From 6e3a36cae5c5981793af376dd41f03ff70940506 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 12:54:11 +0000
Subject: [PATCH] auto-import changelog data from sysstat-3.2.4-5.src.rpm Fri
 Oct 13 2000 Preston Brown <pbrown@redhat.com> - crontab entry was still
 incorrect. Fixed. Mon Oct 09 2000 Preston Brown <pbrown@redhat.com> - make
 sure disk accounting is enabled to fix iostat -l, -p (#16268) - crontab
 entries were missing the user (root) to run as (#18212)

---
 sysstat.spec | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/sysstat.spec b/sysstat.spec
index 1f0f17f..3625b8f 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 3.2.4
-Release: 3
+Release: 5
 Summary: Includes the sar and iostat system monitoring commands.
 License: GPL
 Group: Applications/System
@@ -36,11 +36,23 @@ install -m 644 crontab $RPM_BUILD_ROOT%{_libdir}/sa/crontab.sa
 if [ `id -u` = "0" -a "$1" = "1" ]; then
   cat >> /etc/crontab <<EOF
 # sysstat
-0 * * * 0,6 %{_libdir}/sa/sa1 600 6 &
-5 19 * * * %{_libdir}/sa/sa2 -A &
+0 * * * 0,6 root %{_libdir}/sa/sa1 600 6 &
+5 19 * * * root %{_libdir}/sa/sa2 -A &
 EOF
 fi
-  
+
+%triggerpostun -- sysstat <= 3.2.4-4
+# earlier versions of sysstat had an incorrect crontab entry.  fix it.
+if [ `id -u` = "0" -a "$1" = "2" ]; then
+  egrep -v 'sysstat|sa1|sa2' /etc/crontab > /tmp/crontab.$$
+  cat >> /tmp/crontab.$$ <<EOF
+# sysstat
+0 * * * 0,6 root %{_libdir}/sa/sa1 600 6 &
+5 19 * * * root %{_libdir}/sa/sa2 -A &
+EOF
+  mv /tmp/crontab.$$ /etc/crontab && chmod 644 /etc/crontab
+fi
+
 %postun
 if [ `id -u` = "0" -a "$1" = "0" ]; then
   egrep -v 'sysstat|sa1|sa2' /etc/crontab > /tmp/crontab.$$
@@ -67,6 +79,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/locale/*/LC_MESSAGES/*
 
 %changelog
+* Fri Oct 13 2000 Preston Brown <pbrown@redhat.com>
+- crontab entry was still incorrect.  Fixed.
+
+* Mon Oct 09 2000 Preston Brown <pbrown@redhat.com>
+- make sure disk accounting is enabled to fix iostat -l, -p (#16268)
+- crontab entries were missing the user (root) to run as (#18212)
+
 * Tue Aug 22 2000 Preston Brown <pbrown@redhat.com>
 - enable IO accounting now that kernel supports it