[procinfo] - fixed parsing gcc version string - fixed view on terminal with 80 characters line - fixed comment

[Jan Görig]

commit abc8fff329a17fba10b6fd893fab3f3c571882b9
Author: Jan Görig <jgorig at redhat.com>
Date:   Tue Oct 12 16:06:14 2010 +0200

    - fixed parsing gcc version string
    - fixed view on terminal with 80 characters line
    - fixed comment tag in manpage
    - spec fixes

 procinfo-18-intrprint.patch   |   18 ++++++++++++++++++
 procinfo-18-man-comment.patch |   14 ++++++++++++++
 procinfo-18-version.patch     |   17 +++++++++++++++++
 procinfo.spec                 |   18 +++++++++++++++---
 4 files changed, 64 insertions(+), 3 deletions(-)
---
diff --git a/procinfo-18-intrprint.patch b/procinfo-18-intrprint.patch
new file mode 100644
index 0000000..90b35e0
--- /dev/null
+++ b/procinfo-18-intrprint.patch
@@ -0,0 +1,18 @@
+diff -up procinfo-18/procinfo.c.intrprint procinfo-18/procinfo.c
+--- procinfo-18/procinfo.c.intrprint	2010-10-12 13:37:18.000000000 +0200
++++ procinfo-18/procinfo.c	2010-10-12 13:44:25.500001055 +0200
+@@ -498,11 +498,11 @@ first_page (long sl)
+ 	    for (i = 0; i < rows; i++) {
+ 		/* The last row may be incomplete if howmany is odd, hence: */
+ 		if (i == rows - 1 && howmany & 1) {
+-		    printf ("irq%4d:%10lu %-21s\n",
++		    printf ("irq%4d:%10lu %-20s\n",
+ 			    squirqs[i].nr, squirqs[i].count, squirqs[i].label);
+ 		} else {
+-		    printf ("irq%4d:%10lu %-21s "
+-			    "irq%4d:%10lu %-21s\n",
++		    printf ("irq%4d:%10lu %-20s "
++			    "irq%4d:%10lu %-20s\n",
+ 			    squirqs[i].nr, squirqs[i].count, squirqs[i].label,
+ 			    squirqs[i+rows].nr,
+ 			    squirqs[i+rows].count,
diff --git a/procinfo-18-man-comment.patch b/procinfo-18-man-comment.patch
new file mode 100644
index 0000000..f0b22e1
--- /dev/null
+++ b/procinfo-18-man-comment.patch
@@ -0,0 +1,14 @@
+diff -up procinfo-18/procinfo.8~ procinfo-18/procinfo.8
+--- procinfo-18/procinfo.8~	2010-10-12 15:42:48.999001121 +0200
++++ procinfo-18/procinfo.8	2010-10-12 15:42:49.007001089 +0200
+@@ -178,8 +178,8 @@ or
+ option). Modules with a use count larger than 0 are marked with an
+ asterisk.
+ 
+-." Deleted modules are marked with a `d', uninitialized
+-." modules with a `u', and modules with a bad state flag with a `b'.
++.\" Deleted modules are marked with a `d', uninitialized
++.\" modules with a `u', and modules with a bad state flag with a `b'.
+ 
+ .TP
+ .BI Character\ and\ Block\ Devices:
diff --git a/procinfo-18-version.patch b/procinfo-18-version.patch
new file mode 100644
index 0000000..1a602cd
--- /dev/null
+++ b/procinfo-18-version.patch
@@ -0,0 +1,17 @@
+diff -up procinfo-18/routines.c.version procinfo-18/routines.c
+--- procinfo-18/routines.c.version	2010-10-12 13:37:18.000000000 +0200
++++ procinfo-18/routines.c	2010-10-12 13:40:29.166001055 +0200
+@@ -273,6 +273,13 @@ make_version (FILE * versionfp)
+ 	ret = sscanf (line, "Linux version %s (%[^)]) (gcc %[^(] (%*[^)])) #%s %[^\n]",
+ 		      ver, host, gcc, compno, date);
+ 
++    if (ret != 5) {	/* Red Hat has different format of gcc version... */
++	ret = sscanf (line, "Linux version %s (%[^)]) (gcc %[^)]) (%*[^)]) ) #%s %[^\n]",
++		      ver, host, gcc, compno, date);
++	if(ret == 5)
++		strcat(gcc, ")");
++    }
++
+     if (ret == 3) {	/* At least we've got ver & host right... */
+ 	strcpy (gcc, "[can't parse]");
+ 	strcpy (compno, "???");
diff --git a/procinfo.spec b/procinfo.spec
index 7ae5a60..1d9995b 100644
--- a/procinfo.spec
+++ b/procinfo.spec
@@ -1,7 +1,7 @@
-Summary: A tool for gathering and displaying system information.
+Summary: A tool for gathering and displaying system information
 Name: procinfo
 Version: 18
-Release: 25%{dist}
+Release: 26%{dist}
 License: GPL+
 Group: Applications/System
 Source: ftp://ftp.cistron.nl/pub/people/00-OLD/svm/%{name}-%{version}.tar.gz
@@ -15,8 +15,11 @@ Patch9: procinfo-18-maxdev.patch
 Patch10: procinfo-18-ranges.patch
 Patch11: procinfo-18-cpu-steal.patch
 Patch12: procinfo-18-intr.patch
+Patch13: procinfo-18-intrprint.patch
+Patch14: procinfo-18-version.patch
+Patch15: procinfo-18-man-comment.patch
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel
 
 %description
@@ -40,6 +43,9 @@ data.
 %patch10 -p1 -b .ranges
 %patch11 -p1 -b .steal
 %patch12 -p1 -b .intr
+%patch13 -p1 -b .intrprint
+%patch14 -p1 -b .version
+%patch15 -p1 -b .mancomment
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -I/usr/include/ncurses" LDFLAGS= LDLIBS=-lncurses
@@ -64,6 +70,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/socklist.8*
 
 %changelog
+* Tue Oct 12 2010 Jan Görig <jgorig at redhat.com> 18-26
+- fixed parsing gcc version string
+- fixed view on terminal with 80 characters line
+- fixed comment tag in manpage
+- spec fixes
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 18-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild