From 28d7962e5d8e4a87776d9e1338d6524f6468a7eb Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 12:54:55 +0000
Subject: auto-import changelog data from sysstat-3.3.3-3.src.rpm

Wed Jan 17 2001 Preston Brown <pbrown@redhat.com>
- iostat man page fixes
Fri Jan 05 2001 Preston Brown <pbrown@redhat.com>
- 3.3.3, crontab fixes
Fri Dec 29 2000 Bill Nottingham <notting@redhat.com>
- fix prereqs

---

diff --git a/.cvsignore b/.cvsignore
index caa4ea4..7f46038 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sysstat-3.2.4.tar.gz
+sysstat-3.3.3.tar.gz
diff --git a/sources b/sources
index 61250d6..5774b0b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8922b08c55fc1746e96e6fdd4b8c6de7  sysstat-3.2.4.tar.gz
+f6269656b3603b90257f786679a7aabe  sysstat-3.3.3.tar.gz
diff --git a/sysstat.crondaily b/sysstat.crondaily
new file mode 100644
index 0000000..a7bad2b
--- /dev/null
+++ b/sysstat.crondaily
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# generate a daily summary of process accounting.
+/usr/lib/sa/sa2 -A &
diff --git a/sysstat.spec b/sysstat.spec
index 3625b8f..94eec8c 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,14 +1,17 @@
 Name: sysstat
-Version: 3.2.4
-Release: 5
+Version: 3.3.3
+Release: 3
 Summary: Includes the sar and iostat system monitoring commands.
 License: GPL
 Group: Applications/System
 Source: http://metalab.unc.edu/pub/Linux/system/status/%{name}-%{version}.tar.gz
-Patch0: sysstat-3.2.4-buildroot.patch
-Patch1: sysstat-3.2.4-accounting.patch
+Source1: sysstat.cronhourly
+Source2: sysstat.crondaily
+Patch0: sysstat-3.3.3-config.patch
+Patch1: sysstat-3.3.3-fixman.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}
 Requires: kernel >= 2.2.16-21
+Prereq: sh-utils textutils grep fileutils
 
 %description
 This package provides the sar and iostat commands for the Linux
@@ -17,44 +20,24 @@ They enable system monitoring of disk, network, and other IO activity.
 
 %prep
 %setup -q
-%patch0 -p1 -b .buildroot
-%patch1 -p1 -b .accounting
+%patch0 -p1 -b .config
+%patch1 -p1 -b .fixman
 
 %build
 rm -rf $RPM_BUILD_ROOT
 make CFLAGS="$RPM_OPT_FLAGS" PREFIX=%{_prefix}
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man1,man8}
-mkdir -p $RPM_BUILD_ROOT/var/log/sa
-
-make install PREFIX=%{_prefix} MAN_DIR=%{_mandir} DESTDIR=${RPM_BUILD_ROOT}
-install -m 644 crontab $RPM_BUILD_ROOT%{_libdir}/sa/crontab.sa
-
-%post
-if [ `id -u` = "0" -a "$1" = "1" ]; then
-  cat >> /etc/crontab <<EOF
-# sysstat
-0 * * * 0,6 root %{_libdir}/sa/sa1 600 6 &
-5 19 * * * root %{_libdir}/sa/sa2 -A &
-EOF
-fi
+rm -rf %{buildroot}
+make install MAN_DIR=%{_mandir}
 
-%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
+mkdir -p %{buildroot}/etc/{cron.daily,cron.hourly}
+install %{SOURCE1} %{buildroot}/etc/cron.hourly/sysstat
+install %{SOURCE2} %{buildroot}/etc/cron.daily/sysstat
 
-%postun
-if [ `id -u` = "0" -a "$1" = "0" ]; then
+%triggerpostun -- sysstat <= 3.3.3-1
+# earlier versions of sysstat had crontabs done in a bad way.  fix it.
+if [ `id -u` = "0" -a "$1" -ge "2" ]; then
   egrep -v 'sysstat|sa1|sa2' /etc/crontab > /tmp/crontab.$$
   mv /tmp/crontab.$$ /etc/crontab && chmod 644 /etc/crontab
 fi
@@ -66,11 +49,13 @@ if [ "$1" = 0 ]; then
 fi
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc CHANGES COPYING CREDITS README patch/
+%doc CHANGES COPYING CREDITS README
+/etc/cron.hourly/sysstat
+/etc/cron.daily/sysstat
 %{_bindir}/*
 %{_libdir}/sa
 %{_mandir}/man1/*
@@ -79,6 +64,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/locale/*/LC_MESSAGES/*
 
 %changelog
+* Tue Jan 17 2001 Preston Brown <pbrown@redhat.com>
+- iostat man page fixes
+
+* Fri Jan 05 2001 Preston Brown <pbrown@redhat.com>
+- 3.3.3, crontab fixes
+
+* Fri Dec 29 2000 Bill Nottingham <notting@redhat.com>
+- fix prereqs
+
 * Fri Oct 13 2000 Preston Brown <pbrown@redhat.com>
 - crontab entry was still incorrect.  Fixed.