rpms/man/devel man-1.6e-i18n_makewhatis.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 man-1.5p-sec.patch, 1.1, 1.2 man.spec, 1.52, 1.53 sources, 1.11, 1.12 man-1.6d-i18n_makewhatis.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Dec 11 14:21:22 UTC 2006
Author: varekova
Update of /cvs/dist/rpms/man/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12411
Modified Files:
.cvsignore man-1.5p-sec.patch man.spec sources
Added Files:
man-1.6e-i18n_makewhatis.patch
Removed Files:
man-1.6d-i18n_makewhatis.patch
Log Message:
- update to 1.6e
man-1.6e-i18n_makewhatis.patch:
makewhatis.sh | 512 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 260 insertions(+), 252 deletions(-)
--- NEW FILE man-1.6e-i18n_makewhatis.patch ---
--- man-1.6e/src/makewhatis.sh.i18n 2006-07-19 06:58:08.000000000 +0200
+++ man-1.6e/src/makewhatis.sh 2006-12-11 14:50:46.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# makewhatis: create the whatis database
# Created: Sun Jun 14 10:49:37 1992
# Revised: Sat Jan 8 14:12:37 1994 by faith at cs.unc.edu
@@ -61,32 +61,19 @@
done
DEFCATPATH=$dc
-# In case /usr is read-only, make /usr/foo/whatis (etc) a symlink to
-# something like /var/cache/man/foo-whatis.
-# Some distributions make a single big /var/cache/man/whatis file,
-# but that leads to problems and bugs.
+# make a single big /var/cache/man/whatis file,
+DEFWHATIS=/var/cache/man/whatis
-# AWK=/usr/bin/gawk
AWK=@awk@
-# Find a place for our temporary files. If security is not a concern, use
-# TMPFILE=/tmp/whatis$$; TMPFILEDIR=none
-# Of course makewhatis should only have the required permissions
-# (for reading and writing directories like /usr/man).
-# We try here to be careful (and avoid preconstructed symlinks)
-# in case makewhatis is run as root, by creating a subdirectory of /tmp.
-
-TMPFILEDIR=/tmp/whatis.tmp.dir.$$
-rm -rf $TMPFILEDIR
-if ! mkdir -m 0700 $TMPFILEDIR; then
- echo Could not create $TMPFILEDIR
- exit 1;
-fi
-TMPFILE=$TMPFILEDIR/w
+# Find a place for our temporary files.
+
+if TMPFILE=$(mktemp /tmp/whatis.XXXXXX)
+then
-# make sure TMPFILEDIR is deleted if program is killed or terminates
+# make sure TMPFILE is deleted if program is killed or terminates
# (just delete this line if your shell doesnt know about trap)
-trap "rm -rf $TMPFILEDIR" 0
+trap "rm -rf $TMPFILE" 0
trap "rm -rf $TMPFILEDIR; exit 255" 1 2 3 15
# default find arg: no directories, no empty files
@@ -98,15 +85,17 @@
defcatpath=
if [ -n "$MANSECT" ]; then
- sections=$MANSECT
+ sections=$MANSECT
else
- sections=`$AWK '($1 == "MANSECT") { print $2 }' @man_config_file@`
- if [ x"$sections" = x ]; then
- sections="@sections@"
- fi
+ sections=`$AWK '($1 == "MANSECT") { print $2 }' @man_config_file@`
+ if [ x"$sections" = x ]; then
+ sections="@sections@"
+ fi
fi
sections=`echo $sections | sed -e 's/:/ /g'`
+whatisdb=$DEFWHATIS
+
for name in "$@"
do
if [ -n "$setsections" ]; then
@@ -114,6 +103,11 @@
sections=$name
continue
fi
+if [ -n "$setwhatis" ]; then
+ setwhatis=
+ whatisdb=$name
+ continue
+fi
case $name in
--version|-V)
echo "$program from @version@"
@@ -124,6 +118,8 @@
continue;;
-s) setsections=1
continue;;
+ -o) setwhatis=1
+ continue;;
-u) findarg="-ctime 0"
update=1
continue;;
@@ -132,12 +128,13 @@
-w) manpath=`man --path`
catpath=$manpath
continue;;
- -*) echo "Usage: makewhatis [-s sections] [-u] [-v] [-w] [manpath] [-c [catpath]]"
+ -*) echo "Usage: makewhatis [-s sections] [-u] [-v] [-w] [manpath] [-c [catpath]] [-o whatisdb]"
echo " This will build the whatis database for the man pages"
echo " found in manpath and the cat pages found in catpath."
echo " -s: sections (default: $sections)"
echo " -u: update database with new pages"
echo " -v: verbose"
+ echo " -o: location of whatis database (default: $DEFWHATIS)"
echo " -w: use manpath obtained from \`man --path\`"
echo " [manpath]: man directories (default: $DEFMANPATH)"
echo " [catpath]: cat directories (default: the first existing"
@@ -165,14 +162,7 @@
# first truncate all the whatis files that will be created new,
# then only update - we might visit the same directory twice
if [ x$update = x ]; then
- for pages in man cat
- do
- eval path="\$$pages"path
- for mandir in $path
- do
- cp /dev/null $mandir/whatis
- done
- done
+ cp /dev/null $whatisdb
fi
for pages in man cat
@@ -184,11 +174,6 @@
if [ x$verbose != x ]; then
echo "about to enter $mandir" > /dev/stderr
fi
- if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then
- if [ x$verbose != x ]; then
- echo skipping $mandir - we did it already > /dev/stderr
- fi
- else
here=`pwd`
cd $mandir
for i in $sections
@@ -199,234 +184,257 @@
section=$i
curdir=$mandir/${pages}$i
export section verbose curdir
- find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
-
- function readline() {
- if (use_zcat || use_bzcat) {
- result = (pipe_cmd | getline);
- if (result < 0) {
- print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
- }
- } else {
- result = (getline < filename);
- if (result < 0) {
- print "Read file error: " filename " " ERRNO > "/dev/stderr";
- }
- }
- return result;
+
+ utf8=
+ for x in $(find $mandir/${pages}$i -name '*' $findarg0 $findarg)
+ do
+ if [ ${x%.gz} != ${x} ]
+ then
+ cat=zcat
+ elif [ ${x%.bz2} != ${x} ]
+ then
+ cat=bzcat
+ else
+ cat=cat
+ fi
+
+ if ${cat} ${x} | iconv -f utf-8 -t utf-8 -o /dev/null 2>/dev/null
+ then
+ echo ${x} | $AWK '
+
+ function readline() {
+ if (use_zcat || use_bzcat) {
+ result = (pipe_cmd | getline);
+ if (result < 0) {
+ print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
+ }
+ } else {
+ result = (getline < filename);
+ if (result < 0) {
+ print "Read file error: " filename " " ERRNO > "/dev/stderr";
+ }
+ }
+ return result;
+ }
+
+ function closeline() {
+ if (use_zcat || use_bzcat) {
+ return close(pipe_cmd);
+ } else {
+ return close(filename);
+ }
+ }
+
+ function do_one() {
+ insh = 0; thisjoin = 1; done = 0;
+ entire_line = "";
+
+ if (verbose) {
+ print "adding " filename > "/dev/stderr"
+ }
+
+ use_zcat = match(filename,"\\.Z$") ||
+ match(filename,"\\.z$") || match(filename,"\\.gz$");
+ if (!use_zcat)
+ use_bzcat = match(filename,"\\.bz2");
+ if (use_zcat || use_bzcat) {
+ filename_no_gz = substr(filename, 0, RSTART - 1);
+ } else {
+ filename_no_gz = filename;
+ }
+ match(filename_no_gz, "/[^/]+$");
+ progname = substr(filename, RSTART + 1, RLENGTH - 1);
+ if (match(progname, "\\." section "[A-Za-z]+")) {
+ actual_section = substr(progname, RSTART + 1, RLENGTH - 1);
+ } else {
+ actual_section = section;
+ }
+ sub(/\..*/, "", progname);
+ if (use_zcat || use_bzcat) {
+ if (use_zcat) {
+ pipe_cmd = "zcat \"" filename "\"";
+ } else {
+ pipe_cmd = "bzcat \"" filename "\"";
+ }
+ # try to avoid suspicious stuff
+ if (filename ~ /[;&|`$(]/) {
+ print "ignored strange file name " filename " in " curdir > "/dev/stderr";
+ return;
+ }
+ }
+
+ while (!done && readline() > 0) {
+ gsub(/.\b/, "");
+ if (($1 ~ /^\.[Ss][Hh]/ &&
+ ($2 ~ /[Nn][Aa][Mm][Ee]/ || # en/de
+ $2 ~ /^JMÉNO/ || # cs
+ $2 ~ /^NAVN/ || # da
+ $2 ~ /^NUME/ || # ro
+ $2 ~ /^BEZEICHNUNG/ || # de
+ $2 ~ /^NOMBRE/ || # es
+ $2 ~ /^NIMI/ || # fi
+ $2 ~ /^NOM/ || # fr
+ $2 ~ /^IME/ || # sh
+ $2 ~ /^N[ÉE]V/ || # hu
+ $2 ~ /^NAMA/ || # XXX: what lang is this?
+ $2 ~ /^åå‰/ || # ja
+ $2 ~ /^ì´ë¦„/ || # ko
+ $2 ~ /^NAZWA/ || # pl
+ $2 ~ /^ÐÐЗВÐÐИЕ/ || # ru
+ $2 ~ /^å称/ || # zh_CN/ja
+ $2 ~ /^å稱/ || # zh_TW
+ $2 ~ /^NOME/ || # it/pt
+ $2 ~ /^NAAM/)) || # nl
+ (pages == "cat" && $1 ~ /^NAME/)) {
+ if (!insh) {
+ insh = 1;
+ } else {
+ done = 1;
}
-
- function closeline() {
- if (use_zcat || use_bzcat) {
- return close(pipe_cmd);
- } else {
- return close(filename);
- }
- }
-
- function do_one() {
- insh = 0; thisjoin = 1; done = 0;
- entire_line = "";
-
- if (verbose) {
- print "adding " filename > "/dev/stderr"
- }
-
- use_zcat = match(filename,"\\.Z$") ||
- match(filename,"\\.z$") || match(filename,"\\.gz$");
- if (!use_zcat)
- use_bzcat = match(filename,"\\.bz2");
- if (use_zcat || use_bzcat) {
- filename_no_gz = substr(filename, 0, RSTART - 1);
+ } else if (insh) {
+ if ($1 ~ /^\.[Ss][HhYS]/ ||
+ (pages == "cat" &&
+ ($1 ~ /^S[yYeE]/ || $1 ~ /^DESCRIPTION/ ||
+ $1 ~ /^COMMAND/ || $1 ~ /^OVERVIEW/ ||
+ $1 ~ /^STRUCTURES/ || $1 ~ /^INTRODUCTION/ ||
+ $0 ~ /^[^ ]/))) {
+ # end insh for Synopsis, Syntax, but also for
+ # DESCRIPTION (e.g., XFree86.1x),
+ # COMMAND (e.g., xspread.1)
+ # OVERVIEW (e.g., TclCommandWriting.3)
+ # STRUCTURES (e.g., XEvent.3x)
+ # INTRODUCTION (e.g., TclX.n)
+ # and anything at all that begins in Column 1, so
+ # is probably a section header.
+ done = 1;
+ } else {
+ if ($0 ~ progname"-") { # Fix old cat pages
+ sub(progname"-", progname" - ");
+ }
+ if ($0 ~ /[^ \\]-$/) {
+ sub(/-$/, ""); # Handle Hyphenations
+ nextjoin = 1;
+ } else if ($0 ~ /\\c$/) {
+ sub(/\\c$/, ""); # Handle Continuations
+ nextjoin = 1;
+ } else
+ nextjoin = 0;
+
+ sub(/^.[IB] /, ""); # Kill bold and italics
+ sub(/^.BI /, ""); #
+ sub(/^.SM /, ""); # Kill small
+ sub(/^.Nm /, ""); # Kill bold
+ sub(/^.Tn /, ""); # Kill normal
+ sub(/^.Li /, ""); # Kill .Li
+ sub(/^.Dq /, ""); # Kill .Dq
+ sub(/^.Nd */, "- "); # Convert .Nd to dash
+ sub(/\\\".*/, ""); # Trim pending comments
+ sub(/ *$/, ""); # Trim pending spaces
+ sub(/^\.$/, ""); # Kill blank comments
+ sub(/^'"'"'.*/, ""); # Kill comment/troff lines
+ sub(/^.in .*/, ""); # Kill various macros
+ sub(/^.ti .*/, "");
+ sub(/^.ta .*/, "");
+ sub(/^.Vb .*/, "");
+ sub(/^.[PLTH]P$/, ""); # .PP/.LP/.TP/.HP
+ sub(/^.Pp$/, "");
+ sub(/^.[iI]X .*$/, "");
+ sub(/^.nolinks$/, "");
+ sub(/^.B$/, "");
+ sub(/^.nf$/, "");
+
+ if (($1 ~ /^\.../ || $1 == "") &&
+ (entire_line ~ / - / || entire_line ~ / \\- /)) {
+ # Assume that this ends the description of one line
+ # Sometimes there are several descriptions in one page,
+ # as in outb(2).
+ handle_entire_line();
+ entire_line = "";
+ thisjoin = 1;
+ } else {
+ if (thisjoin) {
+ entire_line = entire_line $0;
} else {
- filename_no_gz = filename;
- }
- match(filename_no_gz, "/[^/]+$");
- progname = substr(filename, RSTART + 1, RLENGTH - 1);
- if (match(progname, "\\." section "[A-Za-z]+")) {
- actual_section = substr(progname, RSTART + 1, RLENGTH - 1);
- } else {
- actual_section = section;
- }
- sub(/\..*/, "", progname);
- if (use_zcat || use_bzcat) {
- if (use_zcat) {
- pipe_cmd = "zcat \"" filename "\"";
- } else {
- pipe_cmd = "bzcat \"" filename "\"";
- }
- # try to avoid suspicious stuff
- if (filename ~ /[;&|`$(]/) {
- print "ignored strange file name " filename " in " curdir > "/dev/stderr";
- return;
- }
- }
-
- while (!done && readline() > 0) {
- gsub(/.\b/, "");
- if (($1 ~ /^\.[Ss][Hh]/ &&
- ($2 ~ /[Nn][Aa][Mm][Ee]/ ||
- $2 ~ /^JMÉNO/ || $2 ~ /^NAVN/ || $2 ~ /^NUME/ ||
- $2 ~ /^BEZEICHNUNG/ || $2 ~ /^NOMBRE/ ||
- $2 ~ /^NIMI/ || $2 ~ /^NOM/ || $2 ~ /^IME/ ||
- $2 ~ /^N[ÉE]V/ || $2 ~ /^NAMA/ || $2 ~ /^̾Á°/ ||
- $2 ~ /^̾¾Î/ || $2 ~ /^À̸§/ || $2 ~ /^NAZWA/ ||
- $2 ~ /^îáú÷áîéå/ || $2 ~ /^Ãû³Æ/ || $2 ~ /^¦WºÙ/ ||
- $2 ~ /^NOME/ || $2 ~ /^NAAM/ || $2 ~ /^ÈÌÅ/)) ||
- (pages == "cat" && $1 ~ /^NAME/)) {
- if (!insh) {
- insh = 1;
- } else {
- done = 1;
- }
- } else if (insh) {
- if ($1 ~ /^\.[Ss][HhYS]/ ||
- (pages == "cat" &&
- ($1 ~ /^S[yYeE]/ || $1 ~ /^DESCRIPTION/ ||
- $1 ~ /^COMMAND/ || $1 ~ /^OVERVIEW/ ||
- $1 ~ /^STRUCTURES/ || $1 ~ /^INTRODUCTION/ ||
- $0 ~ /^[^ ]/))) {
- # end insh for Synopsis, Syntax, but also for
- # DESCRIPTION (e.g., XFree86.1x),
- # COMMAND (e.g., xspread.1)
- # OVERVIEW (e.g., TclCommandWriting.3)
- # STRUCTURES (e.g., XEvent.3x)
- # INTRODUCTION (e.g., TclX.n)
- # and anything at all that begins in Column 1, so
- # is probably a section header.
- done = 1;
- } else {
- if ($0 ~ progname"-") { # Fix old cat pages
- sub(progname"-", progname" - ");
- }
- if ($0 ~ /[^ \\]-$/) {
- sub(/-$/, ""); # Handle Hyphenations
- nextjoin = 1;
- } else if ($0 ~ /\\c$/) {
- sub(/\\c$/, ""); # Handle Continuations
- nextjoin = 1;
- } else
- nextjoin = 0;
-
- sub(/^.[IB] /, ""); # Kill bold and italics
- sub(/^.BI /, ""); #
- sub(/^.SM /, ""); # Kill small
- sub(/^.Nm /, ""); # Kill bold
- sub(/^.Tn /, ""); # Kill normal
- sub(/^.Li /, ""); # Kill .Li
- sub(/^.Dq /, ""); # Kill .Dq
- sub(/^.Nd */, "- "); # Convert .Nd to dash
- sub(/\\\".*/, ""); # Trim pending comments
- sub(/ *$/, ""); # Trim pending spaces
- sub(/^\.$/, ""); # Kill blank comments
- sub(/^'"'"'.*/, ""); # Kill comment/troff lines
- sub(/^.in .*/, ""); # Kill various macros
- sub(/^.ti .*/, "");
- sub(/^.ta .*/, "");
- sub(/^.Vb .*/, "");
- sub(/^.[PLTH]P$/, ""); # .PP/.LP/.TP/.HP
- sub(/^.Pp$/, "");
- sub(/^.[iI]X .*$/, "");
- sub(/^.nolinks$/, "");
- sub(/^.B$/, "");
- sub(/^.nf$/, "");
-
- if (($1 ~ /^\.../ || $1 == "") &&
- (entire_line ~ / - / || entire_line ~ / \\- /)) {
- # Assume that this ends the description of one line
- # Sometimes there are several descriptions in one page,
- # as in outb(2).
- handle_entire_line();
- entire_line = "";
- thisjoin = 1;
- } else {
- if (thisjoin) {
- entire_line = entire_line $0;
- } else {
- entire_line = entire_line " " $0;
- }
- thisjoin = nextjoin;
- }
- }
- }
- }
- handle_entire_line();
- closeline();
- }
-
- function handle_entire_line() {
- x = entire_line; # Keep it short
-
- gsub(/\015/, "", x); # Kill DOS remains
- gsub(/ /, " ", x); # Translate tabs to spaces
- gsub(/ +/, " ", x); # Collapse spaces
- gsub(/ *, */, ", ", x); # Fix comma spacings
- sub(/^ /, "", x); # Kill initial spaces
- sub(/ $/, "", x); # Kill trailing spaces
- sub(/__+/, "_", x); # Collapse underscores
-
- gsub(/\\f\(../, "", x); # Kill font changes
- gsub(/\\f[PRIB0123]/, "", x); # Kill font changes
- gsub(/\\s[-+0-9]*/, "", x); # Kill size changes
- gsub(/\\&/, "", x); # Kill \&
- gsub(/\\\|/, "", x); # Kill \|
- gsub(/\\\((ru|ul)/, "_", x); # Translate
- gsub(/\\\((mi|hy|em)/, "-", x); # Translate
- gsub(/\\\*\(../, "", x); # Kill troff strings
- gsub(/\\/, "", x); # Kill all backslashes
- gsub(/"/, "", x); # Kill quotes (from .Nd "foo bar")
- sub(/<h1 align=center>/, "", x);# Yuk! HTML cruft
- gsub(/\000.*/, "X", x); # Binary cruft in LAPACK pages
- gsub(/ +/, " ", x); # Collapse spaces (again)
- sub(/^ /, "", x); # Kill initial spaces (again)
- sub(/ $/, "", x); # Kill trailing spaces (again)
- sub(/\.$/, "", x); # Kill trailing period
-
- if (!match(x, / - /))
- return;
-
- after_dash = substr(x, RSTART);
- head = substr(x, 1, RSTART-1) ", ";
- while (match(head, /, /)) {
- prog = substr(head, 1, RSTART-1);
- head = substr(head, RSTART+2);
- if (prog != progname)
- prog = prog " [" progname "]";
- printf "%-*s (%s) %s\n", 20, prog, actual_section, after_dash;
+ entire_line = entire_line " " $0;
}
+ thisjoin = nextjoin;
}
+ }
+ }
+ }
+ handle_entire_line();
+ closeline();
+ }
+
+ function handle_entire_line() {
+ x = entire_line; # Keep it short
+
+ gsub(/\015/, "", x); # Kill DOS remains
+ gsub(/ /, " ", x); # Translate tabs to spaces
+ gsub(/ +/, " ", x); # Collapse spaces
+ gsub(/ *, */, ", ", x); # Fix comma spacings
+ sub(/^ /, "", x); # Kill initial spaces
+ sub(/ $/, "", x); # Kill trailing spaces
+ sub(/__+/, "_", x); # Collapse underscores
+
+ gsub(/\\f\(../, "", x); # Kill font changes
+ gsub(/\\f[PRIB0123]/, "", x); # Kill font changes
+ gsub(/\\s[-+0-9]*/, "", x); # Kill size changes
+ gsub(/\\&/, "", x); # Kill \&
+ gsub(/\\\|/, "", x); # Kill \|
+ gsub(/\\\((ru|ul)/, "_", x); # Translate
+ gsub(/\\\((mi|hy|em)/, "-", x); # Translate
+ gsub(/\\\*\(../, "", x); # Kill troff strings
+ gsub(/\\/, "", x); # Kill all backslashes
+ gsub(/"/, "", x); # Kill quotes (from .Nd "foo bar")
+ sub(/<h1 align=center>/, "", x);# Yuk! HTML cruft
+ gsub(/\000.*/, "X", x); # Binary cruft in LAPACK pages
+ gsub(/ +/, " ", x); # Collapse spaces (again)
+ sub(/^ /, "", x); # Kill initial spaces (again)
+ sub(/ $/, "", x); # Kill trailing spaces (again)
+ sub(/\.$/, "", x); # Kill trailing period
+
+ if (!match(x, / - /))
+ return;
+
+ after_dash = substr(x, RSTART);
+ head = substr(x, 1, RSTART-1) ", ";
+ while (match(head, /, /)) {
+ prog = substr(head, 1, RSTART-1);
+ head = substr(head, RSTART+2);
+ if (prog != progname)
+ prog = prog " [" progname "]";
+ printf "%-*s (%s) %s\n", 20, prog, actual_section, after_dash;
+ }
+ }
+
+ { # Main action - process each filename read in.
+ filename = $0;
+ do_one();
+ }
- { # Main action - process each filename read in.
- filename = $0;
- do_one();
- }
' pages=$pages section=$section verbose=$verbose curdir=$curdir
+ fi
+ done
cd ..
fi
done > $TMPFILE
cd $here
- # kludge for Slackware's /usr/man/preformat
- if [ $mandir = /usr/man/preformat ]
+ if [ -f ${whatisdb} ]
then
- mandir1=/usr/man
- else
- mandir1=$mandir
+ cat ${whatisdb} >> $TMPFILE
fi
+ tr -s '\n' < $TMPFILE | sort -u > ${whatisdb}
- if [ -f ${mandir1}/whatis ]
- then
- cat ${mandir1}/whatis >> $TMPFILE
- fi
- tr -s '\n' < $TMPFILE | sort -u > ${mandir1}/whatis
-
- chmod 644 ${mandir1}/whatis
- rm $TMPFILE
- fi
+ chmod 644 ${whatisdb}
done
done
# remove tempdir
-rm -rf $TMPFILEDIR
+rm -rf $TMPFILE
+else # we're here if TMPFILE creation failed
+ exit 1
+fi
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/man/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 22 Jun 2006 12:36:33 -0000 1.11
+++ .cvsignore 11 Dec 2006 14:21:19 -0000 1.12
@@ -1 +1 @@
-man-1.6d.tar.gz
+man-1.6e.tar.gz
man-1.5p-sec.patch:
man.conf.in | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: man-1.5p-sec.patch
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man-1.5p-sec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.5p-sec.patch 10 May 2005 12:42:26 -0000 1.1
+++ man-1.5p-sec.patch 11 Dec 2006 14:21:19 -0000 1.2
@@ -1,14 +1,3 @@
---- man-1.5p/src/makewhatis.sh.sec 2005-05-10 13:00:42.147542040 +0200
-+++ man-1.5p/src/makewhatis.sh 2005-05-10 13:00:42.168538848 +0200
-@@ -50,7 +50,7 @@
- defmanpath=$DEFMANPATH
- defcatpath=
-
--sections="1 2 3 4 5 6 7 8 9 n l"
-+sections=`grep "MANSEC" /etc/man.config | sed -e "1d" -e "s/MANSECT//" -e "s/:/ /g"`
- whatisdb=$DEFWHATIS
-
- for name in "$@"
--- man-1.5p/src/man.conf.in.sec 2005-05-10 13:00:42.000000000 +0200
+++ man-1.5p/src/man.conf.in 2005-05-10 13:01:11.615062296 +0200
@@ -115,7 +115,7 @@
Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- man.spec 27 Oct 2006 06:09:18 -0000 1.52
+++ man.spec 11 Dec 2006 14:21:19 -0000 1.53
@@ -3,8 +3,8 @@
Summary: A set of documentation tools: man, apropos and whatis.
Name: man
-Version: 1.6d
-Release: 3
+Version: 1.6e
+Release: 1%{?dist}
License: GPL
Group: System Environment/Base
Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz
@@ -14,7 +14,7 @@
Patch1: man-1.5m2-confpath.patch
Patch2: man-1.5h1-make.patch
Patch6: man-1.5m2-apropos.patch
-Patch10: man-1.6d-i18n_makewhatis.patch
+Patch10: man-1.6e-i18n_makewhatis.patch
Patch12: man-1.5m2-posix.patch
Patch18: man-1.5p-pipe_makewhatis.patch
Patch19: man-1.5p-sec.patch
@@ -316,6 +316,9 @@
%attr(0775,root,man) %dir %{cache}/X11R6/cat[123456789n]
%changelog
+* Mon Dec 11 2006 Ivana Varekova <varekova at redhat.com> - 1.6e-1
+- update to 1.6e
+
* Thu Oct 26 2006 Ivana Varekova <varekova at redhat.com> - 1.6d-3
- add MAKEWHATISDBUPDATES option (bug 210501)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/man/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 22 Jun 2006 12:36:33 -0000 1.11
+++ sources 11 Dec 2006 14:21:19 -0000 1.12
@@ -1 +1 @@
-36d3f65bcc10f0754a3234e00d92ad6d man-1.6d.tar.gz
+d8187cd756398baefc48ba7d60ff6a8a man-1.6e.tar.gz
--- man-1.6d-i18n_makewhatis.patch DELETED ---
More information about the fedora-cvs-commits
mailing list