rpms/man/devel man-1.6f-makewhatis_use.patch, NONE, 1.1 man.spec, 1.82, 1.83

[Ivana Varekova]

Author: varekova

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

Modified Files:
	man.spec 
Added Files:
	man-1.6f-makewhatis_use.patch 
Log Message:

- fix makewhatis format bug (#513553)


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

--- NEW FILE man-1.6f-makewhatis_use.patch ---
diff -up man-1.6f/src/makewhatis.sh.use man-1.6f/src/makewhatis.sh
--- man-1.6f/src/makewhatis.sh.use	2009-08-11 09:21:11.000000000 +0200
+++ man-1.6f/src/makewhatis.sh	2009-08-11 09:26:40.000000000 +0200
@@ -257,7 +257,7 @@ do
 			 match(filename,"\\.z$") || match(filename,"\\.gz$");
 	      if (!use_zcat)
 		use_bzcat = match(filename,"\\.bz2");
-              if(!use_bzcat)
+              if(!use_bzcat && !use_zcat)
                 use_lzcat = match(filename,"\\.lzma");
               if (use_zcat || use_bzcat || use_lzcat ) {
 		filename_no_gz = substr(filename, 0, RSTART - 1);


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- man.spec	25 Jul 2009 11:42:28 -0000	1.82
+++ man.spec	11 Aug 2009 10:10:38 -0000	1.83
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 21%{?dist}
+Release: 22%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -38,6 +38,7 @@ Patch34: man-1.6f-lang_C.patch
 Patch35: man-1.6f-makewhatis_whis.patch
 Patch36: man-1.6f-makewhatis_update.patch
 Patch37: man-1.6f-makewhatis_perf.patch
+Patch38: man-1.6f-makewhatis_use.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -82,6 +83,7 @@ primary way to find documentation on a L
 %patch35 -p1 -b .whis
 %patch36 -p1 -b .update
 %patch37 -p1 -b .perf
+%patch38 -p1 -b .use
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -265,6 +267,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Aug 11 2009 Ivana Varekova <varekova at redhat.com> - 1.6f-22
+- fix makewhatis format bug (#513553)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6f-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild