rpms/procps/devel procps-3.2.6-top-env-cpuloop.patch, 1.1, 1.2 procps.spec, 1.54, 1.55

[fedora-cvs-commits at redhat.com]

Author: kzak

Update of /cvs/dist/rpms/procps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19701

Modified Files:
	procps-3.2.6-top-env-cpuloop.patch procps.spec 
Log Message:
minor fix

procps-3.2.6-top-env-cpuloop.patch:
 top.1 |    7 +++++++
 top.c |   28 ++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

Index: procps-3.2.6-top-env-cpuloop.patch
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps-3.2.6-top-env-cpuloop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procps-3.2.6-top-env-cpuloop.patch	1 Jun 2006 11:24:50 -0000	1.1
+++ procps-3.2.6-top-env-cpuloop.patch	5 Sep 2006 07:31:57 -0000	1.2
@@ -1,5 +1,5 @@
---- procps-3.2.6/top.c.env-cpuloop	2006-04-19 19:42:22.000000000 +0200
-+++ procps-3.2.6/top.c	2006-04-19 19:44:07.000000000 +0200
+--- procps-3.2.7/top.c.kzak	2006-08-31 10:44:42.000000000 +0200
++++ procps-3.2.7/top.c	2006-08-31 10:46:15.000000000 +0200
 @@ -121,6 +121,7 @@
             Secure_mode = 0;     // set if some functionality restricted
  
@@ -8,7 +8,7 @@
  
          /* Some cap's stuff to reduce runtime calls --
             to accomodate 'Batch' mode, they begin life as empty strings */
-@@ -1672,6 +1673,8 @@
+@@ -1679,6 +1680,8 @@
     
     if (( getenv("STATSIZE")) && ( atoi(getenv("STATSIZE")) == 1 )) 
  	   VIRT_vmsize = 1;
@@ -17,7 +17,7 @@
  }
  
  
-@@ -2949,6 +2952,7 @@
+@@ -2978,6 +2981,7 @@
  {
     static proc_t **p_table = NULL;
     static CPU_t  *smpcpu = NULL;
@@ -25,7 +25,7 @@
  
     // whoa first time, gotta' prime the pump...
     if (!p_table) {
-@@ -2996,6 +3000,27 @@
+@@ -3025,6 +3029,28 @@
  
        smpcpu = cpus_refresh(smpcpu);
  
@@ -42,6 +42,7 @@
 +	   cpu->w_sav = cpu->w;
 +	   cpu->x_sav = cpu->x;
 +	   cpu->y_sav = cpu->y;
++	   cpu->z_sav = cpu->z;
 +	 }
 +         tv.tv_sec = Rc.delay_time;
 +         tv.tv_usec = (Rc.delay_time - (int)Rc.delay_time) * 1000000;
@@ -53,7 +54,7 @@
        if (CHKw(Curwin, View_CPUSUM)) {
           // display just the 1st /proc/stat line
           summaryhlp(&smpcpu[Cpu_tot], "Cpu(s):");
-@@ -3021,6 +3046,8 @@
+@@ -3050,6 +3076,8 @@
     }
  
     SETw(Curwin, NEWFRAM_cwo);
@@ -62,9 +63,9 @@
     return p_table;
  }
  
---- procps-3.2.6/top.1.env-cpuloop	2006-04-19 19:42:22.000000000 +0200
-+++ procps-3.2.6/top.1	2006-04-19 19:42:22.000000000 +0200
-@@ -1173,6 +1173,13 @@
+--- procps-3.2.7/top.1.kzak	2006-08-31 10:44:42.000000000 +0200
++++ procps-3.2.7/top.1	2006-08-31 10:44:42.000000000 +0200
+@@ -1183,6 +1183,13 @@
  Send bug reports to:
     Albert D\. Cahalan, <albert at users.sf.net>
  


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- procps.spec	7 Aug 2006 10:28:25 -0000	1.54
+++ procps.spec	5 Sep 2006 07:31:57 -0000	1.55
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -82,7 +82,7 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p1 -b .kzak
+%patch18 -p1
 %patch19 -p1
 
 cp %SOURCE1 .
@@ -121,6 +121,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Tue Sep  5 2006 Karel Zak <kzak at redhat.com> 3.2.7-6
+- fix minor bug in procps-3.2.6-top-env-cpuloop.patch
+
 * Fri Aug  7 2006 Karel Zak <kzak at redhat.com> - 3.2.7-5
 - fix #189349 - 32bit vmstat on 64bit kernel