rpms/man/devel man-1.6f-loc.patch, 1.2, 1.3 man.lang, 1.2, 1.3 man.spec, 1.74, 1.75

[Ivana Varekova]

Author: varekova

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

Modified Files:
	man-1.6f-loc.patch man.lang man.spec 
Log Message:
fix 485014 - Do not use .mo suffix for gencat message catalogs


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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- man-1.6f-loc.patch	9 Jun 2008 13:24:44 -0000	1.2
+++ man-1.6f-loc.patch	12 Feb 2009 12:44:39 -0000	1.3
@@ -13,7 +13,7 @@
  static void
  catinit (void) {
      if (!cat_is_open) {
-+        setenv("NLSPATH","/usr/share/locale/%l/LC_MESSAGES/%N.mo",0);
++        setenv("NLSPATH","/usr/share/locale/%l/LC_MESSAGES/%N",0);
 +        setlocale(LC_ALL, "");
  #ifdef NL_CAT_LOCALE
  	catfd = my_catopen(mantexts,NL_CAT_LOCALE);


Index: man.lang
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.lang,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- man.lang	9 Jun 2008 13:24:44 -0000	1.2
+++ man.lang	12 Feb 2009 12:44:39 -0000	1.3
@@ -1,38 +1,38 @@
-%lang(bg)   /usr/share/locale/bg/LC_MESSAGES/man.mo
+%lang(bg)   /usr/share/locale/bg/LC_MESSAGES/man
 %lang(bg)   /usr/share/man/bg
-%lang(cs)   /usr/share/locale/cs/LC_MESSAGES/man.mo
+%lang(cs)   /usr/share/locale/cs/LC_MESSAGES/man
 %lang(cs)   /usr/share/man/cs
-%lang(da)   /usr/share/locale/da/LC_MESSAGES/man.mo
+%lang(da)   /usr/share/locale/da/LC_MESSAGES/man
 %lang(da)   /usr/share/man/da
-%lang(de)   /usr/share/locale/de/LC_MESSAGES/man.mo
+%lang(de)   /usr/share/locale/de/LC_MESSAGES/man
 %lang(de)   /usr/share/man/de
-%lang(el)   /usr/share/locale/el/LC_MESSAGES/man.mo
+%lang(el)   /usr/share/locale/el/LC_MESSAGES/man
 %lang(el)   /usr/share/man/el
-%lang(en)   /usr/share/locale/en/LC_MESSAGES/man.mo
+%lang(en)   /usr/share/locale/en/LC_MESSAGES/man
 %lang(en)   /usr/share/man/en
-%lang(es)   /usr/share/locale/es/LC_MESSAGES/man.mo
+%lang(es)   /usr/share/locale/es/LC_MESSAGES/man
 %lang(es)   /usr/share/man/es
-%lang(fi)   /usr/share/locale/fi/LC_MESSAGES/man.mo
+%lang(fi)   /usr/share/locale/fi/LC_MESSAGES/man
 %lang(fi)   /usr/share/man/fi
-%lang(fr)   /usr/share/locale/fr/LC_MESSAGES/man.mo
+%lang(fr)   /usr/share/locale/fr/LC_MESSAGES/man
 %lang(fr)   /usr/share/man/fr
-%lang(hr)   /usr/share/locale/hr/LC_MESSAGES/man.mo
+%lang(hr)   /usr/share/locale/hr/LC_MESSAGES/man
 %lang(hr)   /usr/share/man/hr
-%lang(it)   /usr/share/locale/it/LC_MESSAGES/man.mo
+%lang(it)   /usr/share/locale/it/LC_MESSAGES/man
 %lang(it)   /usr/share/man/it
-%lang(ja)   /usr/share/locale/ja/LC_MESSAGES/man.mo
+%lang(ja)   /usr/share/locale/ja/LC_MESSAGES/man
 %lang(ja)   /usr/share/man/ja
-%lang(ko)   /usr/share/locale/ko/LC_MESSAGES/man.mo
+%lang(ko)   /usr/share/locale/ko/LC_MESSAGES/man
 %lang(ko)   /usr/share/man/ko
-%lang(nl)   /usr/share/locale/nl/LC_MESSAGES/man.mo
+%lang(nl)   /usr/share/locale/nl/LC_MESSAGES/man
 %lang(nl)   /usr/share/man/nl
-%lang(pl)   /usr/share/locale/pl/LC_MESSAGES/man.mo
+%lang(pl)   /usr/share/locale/pl/LC_MESSAGES/man
 %lang(pl)   /usr/share/man/pl
-%lang(pt)   /usr/share/locale/pt/LC_MESSAGES/man.mo
+%lang(pt)   /usr/share/locale/pt/LC_MESSAGES/man
 %lang(pt)   /usr/share/man/pt
-%lang(ro)   /usr/share/locale/ro/LC_MESSAGES/man.mo
+%lang(ro)   /usr/share/locale/ro/LC_MESSAGES/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(ru)   /usr/share/locale/ru/LC_MESSAGES/man
 %lang(sl)   /usr/share/man/sl
+%lang(sl)   /usr/share/locale/sl/LC_MESSAGES/man
 


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- man.spec	21 Nov 2008 10:59:08 -0000	1.74
+++ man.spec	12 Feb 2009 12:44:39 -0000	1.75
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 14%{?dist}
+Release: 15%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -215,7 +215,7 @@
 # move locale files to proper directories
 for i in `ls $RPM_BUILD_ROOT%{_datadir}/locale/`; do
   mkdir  $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES
-  mv $RPM_BUILD_ROOT%{_datadir}/locale/$i/man $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES/man.mo
+  mv $RPM_BUILD_ROOT%{_datadir}/locale/$i/man $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES/man
 done
 
 # remove unpackaged files from the buildroot
@@ -267,6 +267,10 @@
 
 
 %changelog
+* Thu Feb 12 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-15
+- Resolves: #485014
+  Do not use .mo suffix for gencat message catalogs
+
 * Fri Nov 21 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-14
 - Resolves: #456162
   locale settings problem