rpms/procps/devel procps-3.2.7-watch-unicode.patch, 1.1, 1.2 procps.spec, 1.80, 1.81

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/procps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22013

Modified Files:
	procps-3.2.7-watch-unicode.patch procps.spec 
Log Message:

new upstream version 3.2.8


procps-3.2.7-watch-unicode.patch:

Index: procps-3.2.7-watch-unicode.patch
===================================================================
RCS file: /cvs/extras/rpms/procps/devel/procps-3.2.7-watch-unicode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- procps-3.2.7-watch-unicode.patch	23 May 2007 08:00:31 -0000	1.1
+++ procps-3.2.7-watch-unicode.patch	11 May 2009 10:41:10 -0000	1.2
@@ -117,7 +117,7 @@ diff -u procps-3.2.7/watch.c procps/watc
 +				setcchar (&cc, wstr, 0, 0, NULL);
  				move(y, x);
  				if (option_differences) {
--					int oldch = inch();
+-					chtype oldch = inch();
 -					char oldc = oldch & A_CHARTEXT;
 +					cchar_t oldc;
 +					wchar_t oldwstr[2];
@@ -127,7 +127,7 @@ diff -u procps-3.2.7/watch.c procps/watc
 +					in_wch(&oldc);
 +					getcchar(&oldc, oldwstr, &attrs, &colors, NULL);
  					attr = !first_screen
--					    && (c != oldc
+-					    && ((char)c != oldc
 +					    && (wstr[0] != oldwstr[0]
  						||
  						(option_differences_cumulative


Index: procps.spec
===================================================================
RCS file: /cvs/extras/rpms/procps/devel/procps.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- procps.spec	29 Apr 2009 10:53:47 -0000	1.80
+++ procps.spec	11 May 2009 10:41:10 -0000	1.81
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
-Version: 3.2.7
-Release: 28%{?dist}
+Version: 3.2.8
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -38,10 +38,6 @@ Patch16: procps-3.2.7-vmstat-cpusteal.pa
 Patch17: procps-3.2.7-longcmd.patch
 # 189349 - 32bit vmstat on 64bit kernel
 Patch18: procps-3.2.7-vmstat-pgpg.patch
-# 206551 - top fails to convert to cpu single mode when hit '1'
-Patch19: procps-3.2.7-top-single.patch
-# 199174 - top returns with exit code 1 even if no error occurs
-Patch20: procps-3.2.7-top-exitcode.patch
 # 212637 - sysctl using deprecated syscall
 # 228870 - process `sysctl' is using deprecated sysctl ...
 Patch21: procps-3.2.7-sysctl-ignore.patch
@@ -51,11 +47,8 @@ Patch22: procps-3.2.7-top-sorthigh.path
 Patch23: procps-3.2.7-w-best.patch
 # 183029 - watch ignores unicode characters
 Patch24: procps-3.2.7-watch-unicode.patch
-Patch25: procps-3.2.7-sysctl-tmpname.patch
 # 222251 - STIME can jitter by one second
 Patch26: procps-3.2.7-ps-stime.patch
-#208217 - command "ps jax --sort=uid,-ppid,+pid" fails
-Patch27: procps-3.2.7-ps-plussort.patch
 #244152 - ps truncates eip and esp to 32-bit values on 64-bit systems
 Patch28: procps-3.2.7-ps-eip64.patch
 #244960 - ps manpage formatted incorrectly
@@ -89,8 +82,6 @@ Patch41: procps-3.2.7-ps-cgroup.patch
 Patch42: procps-3.2.7-vmstat-partstats-reqwrites.patch
 # '-l' option of 'free' documented
 Patch43: procps-3.2.7-free-hlmem.patch
-#fixes #498182 -  procps string size issue
-Patch44: procps-3.2.7-cleanup.patch
 
 
 BuildRequires: ncurses-devel
@@ -135,15 +126,11 @@ working directory of a process or proces
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
-%patch19 -p1
-%patch20 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
 %patch26 -p1
-%patch27 -p1
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
@@ -160,7 +147,6 @@ working directory of a process or proces
 %patch41 -p1
 %patch42 -p1
 %patch43 -p1
-%patch44 -p1
 
 cp %SOURCE1 .
 
@@ -198,6 +184,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Mon May 11 2009 Daniel Novotny <dnovotny at redhat.com> 3.2.8-1
+- new upstream version; rebase patches and drop upstreamed patches
+
 * Wed Apr 29 2009 Daniel Novotny <dnovotny at redhat.com> 3.2.7-28
 - fix #498182 -  procps string size issue