rpms/man/devel man-1.6f-star.patch,NONE,1.1 man.spec,1.72,1.73

[Ivana Varekova]

Author: varekova

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

Modified Files:
	man.spec 
Added Files:
	man-1.6f-star.patch 
Log Message:
- Resolves: #458042
  makewhatis error on file name with shell meta-characters


man-1.6f-star.patch:

--- NEW FILE man-1.6f-star.patch ---
diff -up man-1.6f/src/makewhatis.sh.pom man-1.6f/src/makewhatis.sh
--- man-1.6f/src/makewhatis.sh.pom	2008-11-20 09:09:18.000000000 +0100
+++ man-1.6f/src/makewhatis.sh	2008-11-20 09:20:55.000000000 +0100
@@ -216,10 +216,10 @@ do
 	   utf8=
             for x in $(find $mandir/${pages}$i -name '*' $findarg0 $findarg)
             do
-               if [ ${x%.gz} != ${x} ]
+               if [ "${x%.gz}" != "${x}" ]
                then
                   cat=zcat
-               elif [ ${x%.bz2} != ${x} ]
+               elif [ "${x%.bz2}" != "${x}" ]
                then
                   cat=bzcat
                else


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- man.spec	19 Nov 2008 10:20:36 -0000	1.72
+++ man.spec	20 Nov 2008 08:59:12 -0000	1.73
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 12%{?dist}
+Release: 13%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -34,6 +34,7 @@
 Patch30: man-1.6f-loc.patch
 Patch31: man-1.6f-tty.patch
 Patch32: man-1.6f-dashes2.patch
+Patch33: man-1.6f-star.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -73,6 +74,7 @@
 %patch30 -p1 -b .loc
 %patch31 -p1 -b .tty
 %patch32 -p1 -b .dash2
+%patch33 -p1 -b .star
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -263,6 +265,10 @@
 
 
 %changelog
+* Thu Nov 20 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-13
+- Resolves: #458042
+  makewhatis error on file name with shell meta-characters
+
 * Tue Nov 18 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-12
 - Resolves: #471784
   makewhatis problem with man-pages with dash in its name