rpms/man/devel man-1.6f-loc.patch, 1.1, 1.2 man.lang, 1.1, 1.2 man.spec, 1.66, 1.67

[Ivana Varekova (varekova)]

Author: varekova

Update of /cvs/pkgs/rpms/man/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29563

Modified Files:
	man-1.6f-loc.patch man.lang man.spec 
Log Message:
- Resolves: #449272 
  Latest man behaves very strange for non-existing man pages
- Resolves: #449275
  Unowned directories where man package provides content for


man-1.6f-loc.patch:

Index: man-1.6f-loc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man-1.6f-loc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.6f-loc.patch	15 May 2008 11:12:23 -0000	1.1
+++ man-1.6f-loc.patch	9 Jun 2008 13:24:44 -0000	1.2
@@ -1,7 +1,24 @@
-diff -up man-1.6f/src/gripes.c.pom man-1.6f/src/gripes.c
---- man-1.6f/src/gripes.c.pom	2008-05-14 16:12:29.000000000 +0200
-+++ man-1.6f/src/gripes.c	2008-05-14 16:23:27.000000000 +0200
-@@ -49,11 +49,11 @@ catinit (void) {
+diff -up man-1.6f/src/gripes.c.loc man-1.6f/src/gripes.c
+--- man-1.6f/src/gripes.c.loc	2008-06-09 14:15:14.000000000 +0200
++++ man-1.6f/src/gripes.c	2008-06-09 14:20:32.000000000 +0200
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
++#include <locale.h>
+ 
+ #include "gripes.h"
+ #include "man.h"		/* for progname */
+@@ -36,6 +37,8 @@ int cat_is_open = 0;
+ static void
+ catinit (void) {
+     if (!cat_is_open) {
++        setenv("NLSPATH","/usr/share/locale/%l/LC_MESSAGES/%N.mo",0);
++        setlocale(LC_ALL, "");
+ #ifdef NL_CAT_LOCALE
+ 	catfd = my_catopen(mantexts,NL_CAT_LOCALE);
+ #else
+@@ -49,11 +52,11 @@ catinit (void) {
  	     */
  	    char *s, *lg;
  	    s = getenv("NLSPATH");


Index: man.lang
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.lang,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man.lang	15 May 2008 11:12:23 -0000	1.1
+++ man.lang	9 Jun 2008 13:24:44 -0000	1.2
@@ -1,38 +1,38 @@
 %lang(bg)   /usr/share/locale/bg/LC_MESSAGES/man.mo
-%lang(bg)   /usr/share/man/bg/man?
+%lang(bg)   /usr/share/man/bg
 %lang(cs)   /usr/share/locale/cs/LC_MESSAGES/man.mo
-%lang(cs)   /usr/share/man/cs/man?
+%lang(cs)   /usr/share/man/cs
 %lang(da)   /usr/share/locale/da/LC_MESSAGES/man.mo
-%lang(da)   /usr/share/man/da/man?
+%lang(da)   /usr/share/man/da
 %lang(de)   /usr/share/locale/de/LC_MESSAGES/man.mo
-%lang(de)   /usr/share/man/de/man?
+%lang(de)   /usr/share/man/de
 %lang(el)   /usr/share/locale/el/LC_MESSAGES/man.mo
-%lang(el)   /usr/share/man/el/man?
+%lang(el)   /usr/share/man/el
 %lang(en)   /usr/share/locale/en/LC_MESSAGES/man.mo
-%lang(en)   /usr/share/man/en/man?
+%lang(en)   /usr/share/man/en
 %lang(es)   /usr/share/locale/es/LC_MESSAGES/man.mo
-%lang(es)   /usr/share/man/es/man?
+%lang(es)   /usr/share/man/es
 %lang(fi)   /usr/share/locale/fi/LC_MESSAGES/man.mo
-%lang(fi)   /usr/share/man/fi/man?
+%lang(fi)   /usr/share/man/fi
 %lang(fr)   /usr/share/locale/fr/LC_MESSAGES/man.mo
-%lang(fr)   /usr/share/man/fr/man?
+%lang(fr)   /usr/share/man/fr
 %lang(hr)   /usr/share/locale/hr/LC_MESSAGES/man.mo
-%lang(hr)   /usr/share/man/hr/man?
+%lang(hr)   /usr/share/man/hr
 %lang(it)   /usr/share/locale/it/LC_MESSAGES/man.mo
-%lang(it)   /usr/share/man/it/man?
+%lang(it)   /usr/share/man/it
 %lang(ja)   /usr/share/locale/ja/LC_MESSAGES/man.mo
-%lang(ja)   /usr/share/man/ja/man?
+%lang(ja)   /usr/share/man/ja
 %lang(ko)   /usr/share/locale/ko/LC_MESSAGES/man.mo
-%lang(ko)   /usr/share/man/ko/man?
+%lang(ko)   /usr/share/man/ko
 %lang(nl)   /usr/share/locale/nl/LC_MESSAGES/man.mo
-%lang(nl)   /usr/share/man/nl/man?
+%lang(nl)   /usr/share/man/nl
 %lang(pl)   /usr/share/locale/pl/LC_MESSAGES/man.mo
-%lang(pl)   /usr/share/man/pl/man?
+%lang(pl)   /usr/share/man/pl
 %lang(pt)   /usr/share/locale/pt/LC_MESSAGES/man.mo
-%lang(pt)   /usr/share/man/pt/man?
+%lang(pt)   /usr/share/man/pt
 %lang(ro)   /usr/share/locale/ro/LC_MESSAGES/man.mo
-%lang(ro)   /usr/share/man/ro/man?
+%lang(ro)   /usr/share/man/ro
 %lang(ru)   /usr/share/locale/ru/LC_MESSAGES/man.mo
 %lang(sl)   /usr/share/locale/sl/LC_MESSAGES/man.mo
-%lang(sl)   /usr/share/man/sl/man?
+%lang(sl)   /usr/share/man/sl
 


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- man.spec	2 Jun 2008 12:10:21 -0000	1.66
+++ man.spec	9 Jun 2008 13:24:44 -0000	1.67
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -261,7 +261,14 @@
 %attr(0755,root,man)    %dir %{cache}/X11R6
 %attr(0755,root,man)    %dir %{cache}/X11R6/cat[123456789n]
 
+
 %changelog
+* 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
+- Resolves: #449275
+  Unowned directories where man package provides content for
+
 * Mon Jun  2 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-7
 - Resolves: #448049
   Error messages will exhibit when quit from mount man page