From 92418027be74abdace573583d721254cc38c25486bb4f58e4a90e15a36512a30 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 24 Feb 2010 01:25:12 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/procps revision 32.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/procps?expand=0&rev=21d068e86f3253044b69f112323aa15a --- procps-3.2.8-gcc45.diff | 17 +++++++++++++++++ procps.changes | 5 +++++ procps.spec | 4 +++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 procps-3.2.8-gcc45.diff diff --git a/procps-3.2.8-gcc45.diff b/procps-3.2.8-gcc45.diff new file mode 100644 index 0000000..198c9e2 --- /dev/null +++ b/procps-3.2.8-gcc45.diff @@ -0,0 +1,17 @@ +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){ diff --git a/procps.changes b/procps.changes index 35148b8..41b8c0c 100644 --- a/procps.changes +++ b/procps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/procps.spec b/procps.spec index b8cd018..6e49311 100644 --- a/procps.spec +++ b/procps.spec @@ -27,7 +27,7 @@ Group: System/Monitoring PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 3.2.8 -Release: 9 +Release: 10 Summary: ps utilities for /proc Provides: ps Obsoletes: ps @@ -65,6 +65,7 @@ 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 @@ -124,6 +125,7 @@ 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" \