Hello community, here is the log from the commit of package procinfo for openSUSE:Factory checked in at Fri Jan 9 14:36:10 CET 2009. -------- --- procinfo/procinfo.changes 2008-11-11 13:01:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/procinfo/procinfo.changes 2009-01-09 11:34:52.439880000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 9 11:34:07 CET 2009 - werner@suse.de + +- Do not be fooled by the newest gcc version string (bnc#464081) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- procinfo-gccver2.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procinfo.spec ++++++ --- /var/tmp/diff_new_pack.q29724/_old 2009-01-09 14:35:34.000000000 +0100 +++ /var/tmp/diff_new_pack.q29724/_new 2009-01-09 14:35:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package procinfo (Version 18) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Group: System/Monitoring AutoReqProv: on Version: 18 -Release: 196 +Release: 197 Summary: Display System Status Gathered from /proc Provides: ps:/usr/bin/lsdev Source: ftp://ftp.cistron.nl/pub/people/svm/%{name}-%{version}.tar.bz2 @@ -45,6 +45,7 @@ Patch13: procinfo-tickless.dif Patch14: procinfo-termcap.diff Patch15: procinfo-disks.dif +Patch16: procinfo-gccver2.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,6 +78,7 @@ %patch14 -p1 %endif %patch15 +%patch16 %build CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${RPM_OPT_FLAGS} -pipe" @@ -101,6 +103,8 @@ %{_mandir}/man8/socklist.8* %changelog +* Fri Jan 09 2009 werner@suse.de +- Do not be fooled by the newest gcc version string (bnc#464081) * Tue Nov 11 2008 werner@suse.de - Do not fail on long devices names in diskstats (bnc#441967) * Fri Aug 22 2008 garloff@suse.de ++++++ procinfo-gccver2.dif ++++++ --- Makefile +++ Makefile 2009-01-09 11:24:11.943029987 +0100 @@ -4,7 +4,7 @@ prefix=/usr CC = gcc -Wall -Wstrict-prototypes -CFLAGS = $(RPM_OPT_FLAGS) -pipe +CFLAGS = $(RPM_OPT_FLAGS) -pipe $(DEBUG) LDFLAGS = -s # If you get lots of `undefined references', you probably need -lncurses --- procinfo.c +++ procinfo.c 2009-01-09 11:06:51.671335375 +0100 @@ -1016,7 +1016,11 @@ main (int ac, char **av) nice (-20); +#ifdef DEBUG_VERSION + versionfp = myfopen (DEBUG_VERSION "version"); +#else versionfp = myfopen (PROC_DIR "version"); +#endif uptimefp = myfopen (PROC_DIR "uptime"); loadavgfp = myfopen (PROC_DIR "loadavg"); meminfofp = myfopen (PROC_DIR "meminfo"); --- routines.c +++ routines.c 2009-01-09 11:30:53.766225818 +0100 @@ -284,6 +284,8 @@ make_version (FILE * versionfp) ret = sscanf (line, "Linux version %s (%[^)]) (gcc %[^(] (%*[^)]) (%*[^)])) #%s %[^\n]", ver, host, gcc, compno, date); if (ret != 5) /* Oogh */ ret = sscanf (line, "Linux version %s (%[^)]) (gcc %[^(] (%*[^)]) (%*[^)])%*[ ]) #%s %[^\n]", ver, host, gcc, compno, date); + if (ret != 5) /* Oogh */ + ret = sscanf (line, "Linux version %s (%[^)]) (gcc %[^(] (%*[^)])%*[ ]) #%s %[^\n]", ver, host, gcc, compno, date); if (ret == 3) { /* At least we've got ver & host right... */ strcpy (gcc, "[can't parse]"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org