rpms/man/devel man-1.6f-dashes2.patch,NONE,1.1 man.spec,1.71,1.72

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/man/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10110

Modified Files:
	man.spec 
Added Files:
	man-1.6f-dashes2.patch 
Log Message:
- Resolves: #471784
  makewhatis problem with man-pages with dash in its name


man-1.6f-dashes2.patch:

--- NEW FILE man-1.6f-dashes2.patch ---
diff -up man-1.6f/src/makewhatis.sh.dash2 man-1.6f/src/makewhatis.sh
--- man-1.6f/src/makewhatis.sh.dash2	2008-11-18 11:04:58.000000000 +0100
+++ man-1.6f/src/makewhatis.sh	2008-11-18 11:13:21.000000000 +0100
@@ -329,9 +329,10 @@ do
 		      # is probably a section header.
 		    done = 1;
 		  } else {
-		    if ($0 ~ progname"-") {  # Fix old cat pages
-			sub(progname"-", progname" - ");
-		    }
+# Thie overwork break the records for man-pages consisting dash in their name
+#		    if ($0 ~ progname"-") {  # Fix old cat pages
+#			sub(progname"-", progname" - ");
+#		    }
 		    if ($0 ~ /[^ \\]-$/) {
 		      sub(/-$/, "");	  # Handle Hyphenations
 		      nextjoin = 1;


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- man.spec	16 Sep 2008 12:00:41 -0000	1.71
+++ man.spec	19 Nov 2008 10:20:36 -0000	1.72
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 11%{?dist}
+Release: 12%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -33,6 +33,7 @@
 Patch29: man-1.6f-fr_translation.patch
 Patch30: man-1.6f-loc.patch
 Patch31: man-1.6f-tty.patch
+Patch32: man-1.6f-dashes2.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -71,6 +72,7 @@
 %patch29 -p1 -b .fr
 %patch30 -p1 -b .loc
 %patch31 -p1 -b .tty
+%patch32 -p1 -b .dash2
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -261,6 +263,10 @@
 
 
 %changelog
+* Tue Nov 18 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-12
+- Resolves: #471784
+  makewhatis problem with man-pages with dash in its name
+
 * Tue Sep 16 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-11
 - Resolves: #460765
   remove makewhatis patch which adds data from rpm database