From 82590b41561fb9a664c4932c5502d8f7172600c4 Mon Sep 17 00:00:00 2001
From: ccb <ccb@fedoraproject.org>
Date: Mon, 4 Oct 2004 19:31:42 +0000
Subject: [PATCH] merge Alan Cox's earlier 'filename patch' add patch for BZ
 129314, more     verbose message about CPU mismatch between accounting file
 and running     system

---
 sysstat-5.0.5-append-msg.patch | 13 +++++++++++++
 sysstat.spec                   | 14 ++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 sysstat-5.0.5-append-msg.patch

diff --git a/sysstat-5.0.5-append-msg.patch b/sysstat-5.0.5-append-msg.patch
new file mode 100644
index 0000000..e6671d2
--- /dev/null
+++ b/sysstat-5.0.5-append-msg.patch
@@ -0,0 +1,13 @@
+--- sysstat-5.0.5/sadc.c.append-msg	2004-09-29 13:15:48.000000000 -0400
++++ sysstat-5.0.5/sadc.c	2004-09-29 13:21:27.000000000 -0400
+@@ -747,7 +747,9 @@
+ 	       create_sa_file(ofd, ofile, file_stats_size, flags);
+ 	       return;
+ 	    }
+-	    fprintf(stderr, _("Cannot append data to that file\n"));
++	    fprintf(stderr, _("Cannot append data to %s,"
++			      " cpu count changed from %d to %d\n"),
++		    ofile, file_hdr.sa_proc, cpu_nr);
+ 	    exit(1);
+ 	 }
+ 	
diff --git a/sysstat.spec b/sysstat.spec
index ea4bae2..c3350ed 100644
--- a/sysstat.spec
+++ b/sysstat.spec
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 5.0.5
-Release: 1
+Release: 5.fc
 Summary: The sar and iostat system monitoring commands.
 License: GPL
 Group: Applications/System
@@ -15,6 +15,8 @@ Patch2: sysstat-5.0.0-history.patch
 Patch3: sysstat-5.0.5-statreset.patch
 Patch4: sysstat-5.0.5-overrun.patch
 Patch5: sysstat-5.0.5-lib64init.patch
+Patch6: sysstat-5.0.5-append-msg.patch
+Patch7: sysstat-5.0.5-filename.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -35,6 +37,9 @@ activity.
 %patch2 -p1 -b .history
 %patch3 -p1 -b .statreset
 %patch4 -p1 -b .overrun
+# see patch5 below
+%patch6 -p1 -b .append-msg
+%patch7 -p1 -b .filename
 
 # Fix initscript for lib64 systems
 
@@ -51,7 +56,7 @@ make CFLAGS="$CFLAGS" PREFIX=%{_prefix} LIB_DIR=%{_libdir} MAN_DIR=%{_mandir} DA
 # 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
+perl -p -e "s|/lib/|/lib64/|g" %{SOURCE1} > sysstat.crond
 %else
 cat %{SOURCE1} > sysstat.crond
 %endif
@@ -119,6 +124,11 @@ rm -rf %{buildroot}
 /var/log/sa
 
 %changelog
+* Thu Sep 30 2004 Charles Bennett <ccb@redhat.com> 5.0.5-5.fc
+- bring in filename and append-msg patch
+- append-msg adds verbose text for when saNN data file cpu count
+-  does not match cpu count on the currently running system
+
 * Wed Jun 30 2004 Nils Philippsen <nphilipp@redhat.com>
 - version 5.0.5
 - remove some obsolete patches