rpms/man/devel man-1.5m2-posix.patch, 1.1, 1.2 man-1.6b-man-pages.patch, 1.1, 1.2 man-1.6f-dashes.patch, 1.1, 1.2 man.spec, 1.68, 1.69
Ivana Varekova
varekova at fedoraproject.org
Tue Sep 2 06:42:58 UTC 2008
Author: varekova
Update of /cvs/pkgs/rpms/man/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17618
Modified Files:
man-1.5m2-posix.patch man-1.6b-man-pages.patch
man-1.6f-dashes.patch man.spec
Log Message:
update patches
man-1.5m2-posix.patch:
Index: man-1.5m2-posix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man-1.5m2-posix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.5m2-posix.patch 9 Sep 2004 08:22:28 -0000 1.1
+++ man-1.5m2-posix.patch 2 Sep 2008 06:42:27 -0000 1.2
@@ -1,6 +1,7 @@
---- man-1.5m2/src/man.conf.in.posix 2004-03-24 15:03:53.000000000 -0500
-+++ man-1.5m2/src/man.conf.in 2004-03-24 15:08:27.000000000 -0500
-@@ -119,7 +119,7 @@
+diff -up man-1.6f/src/man.conf.in.posixxx man-1.6f/src/man.conf.in
+--- man-1.6f/src/man.conf.in.posixxx 2007-08-21 06:15:21.000000000 +0200
++++ man-1.6f/src/man.conf.in 2008-09-01 17:06:48.000000000 +0200
+@@ -119,7 +119,7 @@ COMPRESS_EXT @compress_ext@
# Default manual sections (and order) to search if -S is not specified
# and the MANSECT environment variable is not set.
#
@@ -9,12 +10,12 @@
#
# Default options to use when man is invoked without options
# This is mainly for the benefit of those that think -a should be the default
-@@ -130,7 +130,7 @@
+@@ -130,7 +130,7 @@ MANSECT @sections@
# Decompress with given decompressor when input file has given extension
# The command given must act as a filter.
#
-.gz @gunzip@
+.gz /usr/bin/gunzip -c
.bz2 @bzip2@
+ .lzma @unlzma@
.z @pcat@
- .Z @zcat@
man-1.6b-man-pages.patch:
Index: man-1.6b-man-pages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man-1.6b-man-pages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.6b-man-pages.patch 10 Nov 2005 10:34:16 -0000 1.1
+++ man-1.6b-man-pages.patch 2 Sep 2008 06:42:27 -0000 1.2
@@ -1,38 +1,7 @@
---- man-1.6b/man/en/man.conf.man.pom 2005-09-19 08:30:42.000000000 +0200
-+++ man-1.6b/man/en/man.conf.man 2005-11-10 11:17:04.079116184 +0100
-@@ -1,7 +1,7 @@
- .\" @(#)man.conf
--.TH MAN.CONF 5 "September 19, 2005"
-+.TH MAN.CONFIG 5 "September 19, 2005"
- .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.6b/man/en/makewhatis.man.pom 2005-09-19 08:29:48.000000000 +0200
-+++ man-1.6b/man/en/makewhatis.man 2005-11-10 11:17:51.367927192 +0100
-@@ -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.6b/man/en/man.man.pom 2005-09-19 08:27:29.000000000 +0200
-+++ man-1.6b/man/en/man.man 2005-11-10 11:19:03.836910232 +0100
-@@ -72,7 +72,7 @@
+diff -up man-1.6f/man/en/man.man.up12346 man-1.6f/man/en/man.man
+--- man-1.6f/man/en/man.man.up12346 2007-12-22 12:38:57.000000000 +0100
++++ man-1.6f/man/en/man.man 2008-09-01 17:27:43.000000000 +0200
+@@ -101,7 +101,7 @@ Distributions customize the manual secti
Specify the configuration file to use; the default is
.BR @man_config_file@ .
(See
@@ -41,7 +10,7 @@
.TP
.B \-\^M " path"
Specify the list of directories to search for man pages.
-@@ -218,7 +218,7 @@
+@@ -247,7 +247,7 @@ can be specified in
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.
@@ -50,9 +19,43 @@
.PP
It is possible to make
.B man
-@@ -491,4 +491,4 @@
- Zeyd M. Ben-Halim released man 1.2, and Andries Brouwer followed up with versions 1.3 thru 1.5p.
+@@ -521,4 +521,4 @@ Zeyd M. Ben-Halim released man 1.2, and
+ versions 1.3 thru 1.5p.
Federico Lucifredi <flucifredi at acm.org> is the current maintainer.
.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).
+diff -up man-1.6f/man/en/makewhatis.man.up12346 man-1.6f/man/en/makewhatis.man
+--- man-1.6f/man/en/makewhatis.man.up12346 2006-07-19 06:28:47.000000000 +0200
++++ man-1.6f/man/en/makewhatis.man 2008-09-01 17:27:43.000000000 +0200
+@@ -49,7 +49,7 @@ is assumed by default.
+ .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
+diff -up man-1.6f/man/en/man.conf.man.up12346 man-1.6f/man/en/man.conf.man
+--- man-1.6f/man/en/man.conf.man.up12346 2005-09-19 08:30:42.000000000 +0200
++++ man-1.6f/man/en/man.conf.man 2008-09-01 17:27:43.000000000 +0200
+@@ -1,7 +1,7 @@
+ .\" @(#)man.conf
+-.TH MAN.CONF 5 "September 19, 2005"
++.TH MAN.CONFIG 5 "September 19, 2005"
+ .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 @@ and (c) a list with uncompressors for fi
+ 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.6f-dashes.patch:
Index: man-1.6f-dashes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man-1.6f-dashes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.6f-dashes.patch 20 Mar 2008 09:50:07 -0000 1.1
+++ man-1.6f-dashes.patch 2 Sep 2008 06:42:27 -0000 1.2
@@ -1,11 +1,12 @@
---- man-1.6d/src/makewhatis.sh.dash 2006-10-24 08:56:44.000000000 +0200
-+++ man-1.6d/src/makewhatis.sh 2006-10-24 09:52:24.000000000 +0200
-@@ -353,7 +353,7 @@
- sub(/ $/, "", x); # Kill trailing spaces (again)
+diff -up man-1.6f/src/makewhatis.sh.dash man-1.6f/src/makewhatis.sh
+--- man-1.6f/src/makewhatis.sh.dash 2008-09-01 17:37:13.000000000 +0200
++++ man-1.6f/src/makewhatis.sh 2008-09-01 17:37:13.000000000 +0200
+@@ -415,7 +415,7 @@ do
+ sub(/ $/, "", x); # Kill trailing spaces (again)
sub(/\.$/, "", x); # Kill trailing period
- if (!match(x, / - /))
+ if (!match(x, / --? /))
- return;
+ return;
after_dash = substr(x, RSTART);
Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- man.spec 1 Sep 2008 14:44:59 -0000 1.68
+++ man.spec 2 Sep 2008 06:42:27 -0000 1.69
@@ -63,7 +63,7 @@
%patch19 -p1 -b .sec
%patch20 -p1 -b .xorg
%patch21 -p1 -b .i18n_nroff
-%patch22 -p1 -b .up
+%patch22 -p1 -b .up
%patch23 -p1 -b .rpm
%patch24 -p1 -b .disp
%patch25 -p1 -b .dash
More information about the fedora-extras-commits
mailing list