rpms/man/devel man-1.5p-man-pages.patch, NONE, 1.1 man.spec, 1.34, 1.35

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	man.spec 
Added Files:
	man-1.5p-man-pages.patch 
Log Message:
fix bug 140732 in man pages and the rest of bug 140207 change in man-pages again


man-1.5p-man-pages.patch:
 makewhatis.man |    2 +-
 man.conf.man   |    6 +++---
 man.man        |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE man-1.5p-man-pages.patch ---
--- man-1.5p/man/en/man.conf.man.pom	2003-03-11 16:53:31.000000000 +0100
+++ man-1.5p/man/en/man.conf.man	2005-04-08 11:59:21.409058096 +0200
@@ -1,7 +1,7 @@
 .\" @(#)man.conf
-.TH MAN.CONF 5 "30 Mar 1994"
+.TH MAN.CONFIG 5 "30 Mar 1994"
 .SH NAME
-man.conf \- configuration data for man
+man.config \- configuration data for man
 .SH DESCRIPTION
 .LP
 This file is read by
@@ -12,7 +12,7 @@
 An alternative version of this file can be specified with
 .LP
 .RS
-man -C private_man.conf ...
+man -C private_man.config ...
 .RE
 .LP
 The command names may be provided with options. 
--- man-1.5p/man/en/makewhatis.man.pom	2003-03-11 16:53:31.000000000 +0100
+++ man-1.5p/man/en/makewhatis.man	2005-04-08 11:59:21.444052776 +0200
@@ -49,7 +49,7 @@
 .SH OPTIONS
 .TP
 .B -u
-Update database with new pages.
+Update database with new pages (file's status was last changed 24 hours ago)
 .TP
 .B -v
 Verbose output
--- man-1.5p/man/en/man.man.pom	2003-12-09 22:22:46.000000000 +0100
+++ man-1.5p/man/en/man.man	2005-04-08 11:59:21.445052624 +0200
@@ -67,7 +67,7 @@
 Specify the configuration file to use; the default is
 .BR @man_config_file@ .
 (See
-.BR man.conf (5).)
+.BR man.config (5).)
 .TP
 .B \-\^M " path"
 Specify the list of directories to search for man pages.
@@ -189,7 +189,7 @@
 No cat pages are saved when the required cat directory does not exist.
 No cat pages are saved when they are formatted for a line length
 different from 80.
-No cat pages are saved when man.conf contains the line NOCACHE.
+No cat pages are saved when man.config contains the line NOCACHE.
 .PP
 It is possible to make
 .B man
@@ -421,7 +421,7 @@
 .B \-m
 option). 
 .SH "SEE ALSO"
-apropos(1), whatis(1), less(1), groff(1), man.conf(5).
+apropos(1), whatis(1), less(1), groff(1), man.config(5).
 .SH BUGS
 The
 .B \-t


Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- man.spec	22 Mar 2005 07:34:18 -0000	1.34
+++ man.spec	8 Apr 2005 11:05:14 -0000	1.35
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis.
 Name: man
 Version: 1.5p
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 Source0: ftp://ftp.win.tue.nl/pub/linux-local/utils/man/man-%{version}.tar.gz
@@ -22,6 +22,7 @@
 Patch14: man-1.5p-makewhatis3.patch
 Patch15: man-1.5p-mandirlist.patch
 Patch16: man-1.5p-man2html.patch
+Patch17: man-1.5p-man-pages.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 PreReq: coreutils
@@ -53,6 +54,7 @@
 %patch14 -p1 -b .update
 %patch15 -p1 -b .lang
 %patch16 -p1 -b .man2html
+%patch17 -p1 -b .up 
 
 cp -f %{SOURCE3} msgs	# replace bad ru trans
 
@@ -310,6 +312,10 @@
 %attr(0775,root,man)	%dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Thu Mar 29 2005 Ivana Varekova <varekova at redhat.com> 1.5p-4
+- fix bug 140732 in man pages and the rest of bug 140207 change 
+   in man-pages again (patch 17)
+
 * Thu Mar 22 2005 Ivana Varekova <varekova at redhat.com> 1.5p-3
 - fix bug 142673 - bugs in man2html