From 46da1eddca6b6c77f441a7d7f234029c8b5ac95d Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 13:00:53 +0000
Subject: auto-import sysstat-4.0.7-4.rhl9.1 from sysstat-4.0.7-4.rhl9.1.src.rpm


---

diff --git a/sysstat.crond b/sysstat.crond
index 04a1771..ebb6260 100644
--- a/sysstat.crond
+++ b/sysstat.crond
@@ -1,5 +1,5 @@
 # run system activity accounting tool every 10 minutes
-*/10 * * * * root /usr/lib64/sa/sa1 1 1
+*/10 * * * * root /usr/lib/sa/sa1 1 1
 # generate a daily summary of process accounting at 23:53
-53 23 * * * root /usr/lib64/sa/sa2 -A
+53 23 * * * root /usr/lib/sa/sa2 -A
 
diff --git a/sysstat.spec b/sysstat.spec
index 6416321..331e801 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 4.0.7
-Release: 4
+Release: 4.rhl9.1
 Summary: The sar and iostat system monitoring commands.
 License: GPL
 Group: Applications/System
@@ -13,6 +13,8 @@ Patch1: sysstat-4.0.1-prevday.patch
 Patch2: sysstat-3.3.5-fixutilization.patch
 Patch3: sysstat-4.0.1-verbose.patch
 Patch4: sysstat-4.0.7-lib64.patch
+Patch5: sysstat-4.0.1-longifnames.patch
+Patch6: sysstat-4.0.7-maxparts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Requires: kernel >= 2.2.16-21
@@ -30,6 +32,8 @@ activity.
 #patch2 -p1 -b .fixutilization
 %patch3 -p1 -b .verbose
 %patch4 -p1 -b .lib64
+%patch5 -p1 -b .longifnames
+%patch6 -p1 -b .maxparts
 
 %build
 # FIXME: I need to fix the upstream Makefile to use LIBDIR et al. properly and
@@ -37,6 +41,14 @@ activity.
 CFLAGS="$RPM_OPT_FLAGS -DSADC_PATH=\\\"%{_libdir}/sa/sadc\\\""
 make CFLAGS="$CFLAGS" PREFIX=%{_prefix} LIB_DIR=%{_libdir} MAN_DIR=%{_mandir} DATA_DIR=%{_datadir} DOC_DIR=%{_docdir}
 
+# Thou shalt not write to source files or patches
+rm -f sysstat.crond
+%if %_lib == "lib64"
+perl -p -e "s|/lib|/lib64|g" %{SOURCE1} > sysstat.crond
+%else
+cat %{SOURCE1} > sysstat.crond
+%endif
+
 %install
 rm -rf %{buildroot}
 
@@ -45,11 +57,7 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}/etc/{cron.daily,cron.d}
 
-%ifarch x86_64 ppc64 s390x
-perl -pi -e "s|/lib|/lib64|g" %{SOURCE1}
-%endif
-
-install %{SOURCE1} %{buildroot}/etc/cron.d/sysstat
+install sysstat.crond %{buildroot}/etc/cron.d/sysstat
 #install %{SOURCE2} %{buildroot}/etc/cron.daily/sysstat
 
 # sysstat makefiles install the docs in the wrong place, blow them away
@@ -61,8 +69,8 @@ rm -f %{buildroot}/usr/share/doc/*
 %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
+  egrep -v 'sysstat|sa1|sa2' /etc/crontab > /etc/crontab.tmp.$$ && \
+  mv /etc/crontab.tmp.$$ /etc/crontab && chmod 644 /etc/crontab
 fi
 
 %preun
@@ -86,8 +94,15 @@ rm -rf %{buildroot}
 /var/log/sa
 
 %changelog
-* Mon Mar  3 2003 Joe Orton <jorton@redhat.com> 4.0.7-4
-- really fix paths for multilib (#82913)
+* Tue Feb 24 2004 Nils Philippsen <nphilipp@redhat.com> 4.0.7-4.rhl9.1
+- up release to supersede all (known) previous releases on RHL9
+
+* Tue Feb 24 2004 Nils Philippsen <nphilipp@redhat.com> 4.0.7-3.rhl9.1
+- fix insecure tmp files in scripts (#78212)
+- fix dealing with lib64 case of cron.d file
+- fix paths on multilib arches
+- handle interface names longer than 5 characters (#92052)
+- increase maximum number of partitions (#110822)
 
 * Wed Feb 19 2003 Bill Nottingham <notting@redhat.com> 4.0.7-3
 - fix paths on multilib arches (#82913)