rpms/man/F-12 man-1.6f-makewhatis_vari.patch, NONE, 1.1 man.spec, 1.85, 1.86

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/man/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23189

Modified Files:
	man.spec 
Added Files:
	man-1.6f-makewhatis_vari.patch 
Log Message:
- fix the variable name bug in makewhatis script (#560362)


man-1.6f-makewhatis_vari.patch:
 makewhatis.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE man-1.6f-makewhatis_vari.patch ---
diff -up man-1.6f/src/makewhatis.sh.vari man-1.6f/src/makewhatis.sh
--- man-1.6f/src/makewhatis.sh.vari	2010-02-01 11:18:43.000000000 +0100
+++ man-1.6f/src/makewhatis.sh	2010-02-01 11:19:14.000000000 +0100
@@ -79,7 +79,7 @@ then
 # 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 $TMPFILE" 0 
-trap "rm -rf $TMPFILEDIR; exit 255" 1 2 3 15
+trap "rm -rf $TMPFILE; exit 255" 1 2 3 15
 
 # default find arg: no directories, no empty files
 findarg0="-type f -size +0"


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/F-12/man.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- man.spec	26 Jan 2010 08:03:05 -0000	1.85
+++ man.spec	1 Feb 2010 10:30:40 -0000	1.86
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 24%{?dist}
+Release: 25%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -42,6 +42,8 @@ Patch38: man-1.6f-makewhatis_use.patch
 Patch39: man-1.6f-man2html-suffixes.patch
 # 542852 -  'man cut cut' throws an error 
 Patch40: man-1.6f-diff.patch
+Patch41: man-1.6f-variable.patch
+
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -89,6 +91,8 @@ primary way to find documentation on a L
 %patch38 -p1 -b .use
 %patch39 -p1 -b .suff
 %patch40 -p1 -b .diff
+%patch41 -p1 -b .vari
+
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -272,6 +276,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb  1 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 1.6f-25
+- fix the variable name bug in makewhatis script (#560362)
+
 * Tue Jan 26 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 1.6f-24
 - fix the problem: #542852 -  'man cut cut' throws an error