rpms/man/devel man-1.5p-man2html.patch,NONE,1.1 man.spec,1.33,1.34

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/man/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5212

Modified Files:
	man.spec 
Added Files:
	man-1.5p-man2html.patch 
Log Message:
bug 142673 - bugs in man2html


man-1.5p-man2html.patch:
 man2html.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

--- NEW FILE man-1.5p-man2html.patch ---
--- man-1.5p/man2html/man2html.c.pom	2005-03-17 13:32:24.000000000 +0100
+++ man-1.5p/man2html/man2html.c	2005-03-18 15:42:05.706311936 +0100
@@ -184,7 +184,7 @@
 		    char t,te,tg,*e;
 		    e=h+1;
 		    while (h>c && (isalnum(h[-1]) || h[-1]=='_' ||
-				    h[-1]=='-' || h[-1]=='.'))
+				    h[-1]=='-' || h[-1]=='.' || h[-1]==':'))
 			h--;
 		    t=*h; *h=0;
 		    printf("%s", c);
@@ -765,7 +765,15 @@
 	    break;
 	case 'v': case 'V':
 	case 'w': case 'W':
-	    c=scan_expression(c+2,&curfield->width);
+//	    c=scan_expression(c+2,&curfield->width);
+             c++;
+	     if (*c == '(') {
+	        c=scan_expression(c+1,&curfield->width);
+	     } else {
+	     	i=0;
+	     	while (isdigit(*c)) i=i*10+(*c++)-'0';
+	        curfield->width=i;
+	     }
 	    break;
 	case '|':
 	    if (curfield->align) curfield->vleft++;

Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- man.spec	16 Mar 2005 08:40:19 -0000	1.33
+++ man.spec	22 Mar 2005 07:34:18 -0000	1.34
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis.
 Name: man
 Version: 1.5p
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/man-%{version}.tar.gz
@@ -21,6 +21,7 @@
 Patch13: man-1.5p-makewhatis2.patch
 Patch14: man-1.5p-makewhatis3.patch
 Patch15: man-1.5p-mandirlist.patch
+Patch16: man-1.5p-man2html.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 PreReq: coreutils
@@ -51,6 +52,7 @@
 %patch13 -p1 -b .trap
 %patch14 -p1 -b .update
 %patch15 -p1 -b .lang
+%patch16 -p1 -b .man2html
 
 cp -f %{SOURCE3} msgs	# replace bad ru trans
 
@@ -308,6 +310,9 @@
 %attr(0775,root,man)	%dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Thu Mar 22 2005 Ivana Varekova <varekova at redhat.com> 1.5p-3
+- fix bug 142673 - bugs in man2html
+
 * Thu Mar 16 2005 Ivana Varekova <varekova at redhat.com> 1.5p-2
 - fix bug 140178 - correct one typo 
 - fix bug 140202 - problem with makewhatis exit (patch 13)