Accepting request 33161 from Base:System

checked in (request 33161)

OBS-URL: https://build.opensuse.org/request/show/33161
OBS-URL: https://build.opensuse.org/package/show/Base:System/procps?expand=0&rev=20

procps-3.2.8-gcc45.diff

@@ -1,17 +0,0 @@
-Index: procps-3.2.8/ps/output.c
-===================================================================
---- procps-3.2.8.orig/ps/output.c
-+++ procps-3.2.8/ps/output.c
-@@ -463,11 +463,11 @@ static int pr_pcpu(char *restrict const
-   double uptime_secs;
-   total_time = pp->utime + pp->stime;
-   if(include_dead_children) total_time += (pp->cutime + pp->cstime);
-   jiffies = jiffies_since_boot - pp->start_time;
-   if(jiffies) pcpu = (total_time * 1000ULL) / jiffies;
--  if (pcpu/10U => 100U)		    /* do not confuse the user by scale effects */
-+  if (pcpu/10U >= 100U)		    /* do not confuse the user by scale effects */
-     return snprintf(outbuf, COLWID, "100");
-   return snprintf(outbuf, COLWID, "%u.%u", pcpu/10U, pcpu%10U);
- }
- /* this is a "per-mill" format, like %cpu with no decimal point */
- static int pr_cp(char *restrict const outbuf, const proc_t *restrict const pp){

procps.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Mon Feb 22 22:25:48 CET 2010 - seife@opensuse.org
-
-- fix build with gcc 4.5 ("=>" is no nonger valid, now it's ">=")
-
 -------------------------------------------------------------------
 Thu Feb 18 12:12:04 CET 2010 - werner@suse.de
 

procps.spec

@@ -65,7 +65,6 @@ Patch28:        procps-3.2.6-xen.dif
 Patch29:        procps-3.2.8-fdleak.dif
 Patch30:        procps-3.2.8-sysctlerr.dif
 Patch31:        procps-3.2.8-columns.dif
-Patch32:        procps-3.2.8-gcc45.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -125,7 +124,6 @@ Authors:
 %patch29
 %patch30
 %patch31
-%patch32 -p1
 
 %build
 make %{?jobs:-j%jobs} CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \