rpms/man/devel man-1.6f-i18n_makewhatis.patch, 1.1, 1.2 man.spec, 1.67, 1.68

[Ivana Varekova]

Author: varekova

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

Modified Files:
	man-1.6f-i18n_makewhatis.patch man.spec 
Log Message:
update patches


man-1.6f-i18n_makewhatis.patch:

Index: man-1.6f-i18n_makewhatis.patch
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man-1.6f-i18n_makewhatis.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.6f-i18n_makewhatis.patch	20 Mar 2008 09:50:07 -0000	1.1
+++ man-1.6f-i18n_makewhatis.patch	1 Sep 2008 14:44:59 -0000	1.2
@@ -1,12 +1,13 @@
---- 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
+diff -up man-1.6f/src/makewhatis.sh.i18n_makewhatis man-1.6f/src/makewhatis.sh
+--- man-1.6f/src/makewhatis.sh.i18n_makewhatis	2007-09-17 20:35:14.000000000 +0200
++++ man-1.6f/src/makewhatis.sh	2008-09-01 16:06:05.000000000 +0200
 @@ -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 @@
+@@ -61,32 +61,19 @@ do
  done
  DEFCATPATH=$dc
  
@@ -47,7 +48,7 @@
  trap "rm -rf $TMPFILEDIR; exit 255" 1 2 3 15
  
  # default find arg: no directories, no empty files
-@@ -98,15 +85,17 @@
+@@ -98,15 +85,17 @@ defmanpath=$DEFMANPATH
  defcatpath=
  
  if [ -n "$MANSECT" ]; then
@@ -70,7 +71,7 @@
  for name in "$@"
  do
  if [ -n "$setsections" ]; then
-@@ -114,6 +103,11 @@
+@@ -114,6 +103,11 @@ if [ -n "$setsections" ]; then
  	sections=$name
  	continue
  fi
@@ -82,7 +83,7 @@
  case $name in
      --version|-V)
  	echo "$program from @version@"
-@@ -124,6 +118,8 @@
+@@ -124,6 +118,8 @@ case $name in
  	continue;;
      -s) setsections=1
  	continue;;
@@ -91,7 +92,7 @@
      -u) findarg="-ctime 0"
  	update=1
  	continue;;
-@@ -132,12 +128,13 @@
+@@ -132,12 +128,13 @@ case $name in
      -w) manpath=`man --path`
  	catpath=$manpath
  	continue;;
@@ -106,7 +107,7 @@
  	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 @@
+@@ -165,14 +162,7 @@ catpath=`echo ${catpath} | tr : ' '`
  # 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
@@ -122,10 +123,10 @@
  fi
  
  for pages in man cat
-@@ -184,11 +174,6 @@
-	fi
-     fi
-
+@@ -212,11 +202,6 @@ do
+ 	fi
+      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
@@ -133,8 +134,8 @@
 -     else      
         here=`pwd`
         cd $mandir
-        for i in $sections--- man-1.6f/src/makewhatis.sh	2008-03-14 14:23:27.000000000 +0100
-@@ -212,7 +212,23 @@
+        for i in $sections
+@@ -227,7 +212,23 @@ do
  	    section=$i
  	    curdir=$mandir/${pages}$i
  	    export section verbose curdir
@@ -159,7 +160,7 @@
  
  	    function readline() {
                if (use_zcat || use_bzcat || use_lzcat) {
-@@ -424,18 +440,19 @@
+@@ -439,18 +440,19 @@ do
  
         cd "$here"
  


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- man.spec	9 Jun 2008 13:24:44 -0000	1.67
+++ man.spec	1 Sep 2008 14:44:59 -0000	1.68
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -263,6 +263,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-9
+- update patches
+
 * Mon Jun  9 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-8
 - Resolves: #449272 
   Latest man behaves very strange for non-existing man pages