rpms/man/devel man-1.6f-lang_C.patch,NONE,1.1 man.spec,1.73,1.74

[Ivana Varekova]

Author: varekova

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

Modified Files:
	man.spec 
Added Files:
	man-1.6f-lang_C.patch 
Log Message:
- Resolves: #456162
  locale settings problem


man-1.6f-lang_C.patch:

--- NEW FILE man-1.6f-lang_C.patch ---
diff -up man-1.6f/src/manpath.c.pom man-1.6f/src/manpath.c
--- man-1.6f/src/manpath.c.pom	2008-11-21 11:32:40.000000000 +0100
+++ man-1.6f/src/manpath.c	2008-11-21 11:32:21.000000000 +0100
@@ -256,6 +256,11 @@ add_to_list (char *dir, char *lang, int 
 static void
 add_to_mandirlist_x (char *dir, char *lang, int perrs) {
 	add_to_list(dir, lang, perrs);
+        if (lang && strncmp(lang,"C",1) == 0) {
+                char lang2[2];
+                lang2[0] = 0;
+                add_to_list(dir, lang2, perrs);
+        }
 	if (lang && strlen(lang) > 5 && lang[5] == '.') {
 		char lang2[6];	/* e.g. zh_CN from zh_CN.GB2312 */
 


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- man.spec	20 Nov 2008 08:59:12 -0000	1.73
+++ man.spec	21 Nov 2008 10:59:08 -0000	1.74
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -35,6 +35,7 @@
 Patch31: man-1.6f-tty.patch
 Patch32: man-1.6f-dashes2.patch
 Patch33: man-1.6f-star.patch
+Patch34: man-1.6f-lang_C.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -75,6 +76,7 @@
 %patch31 -p1 -b .tty
 %patch32 -p1 -b .dash2
 %patch33 -p1 -b .star
+%patch34 -p1 -b .lang
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -265,6 +267,10 @@
 
 
 %changelog
+* Fri Nov 21 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-14
+- Resolves: #456162
+  locale settings problem
+
 * Thu Nov 20 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-13
 - Resolves: #458042
   makewhatis error on file name with shell meta-characters