rpms/man/devel man-1.6f-loc.patch, NONE, 1.1 man.lang, NONE, 1.1 man.spec, 1.64, 1.65

Thu May 15 11:13:00 UTC 2008

Author: varekova

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

Modified Files:
	man.spec 
Added Files:
	man-1.6f-loc.patch man.lang 
Log Message:
- Resolves: #439314
  move locale files
- spec file cleanup


man-1.6f-loc.patch:

--- NEW FILE man-1.6f-loc.patch ---
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) {
 	     */
 	    char *s, *lg;
 	    s = getenv("NLSPATH");
-	    lg = getenv("LANG");
+	    lg = getenv("LC_ALL");
 	    if (!lg)
 		    lg = getenv("LC_MESSAGES");
 	    if (!lg)
-		    lg = getenv("LC_ALL");
+		    lg = getenv("LANG");
 	    if (lg && strncmp(lg, "en", 2) && strcmp(lg, "C") && strcmp(lg, "POSIX")) {
 		fprintf(stderr,
 		  "Cannot open the message catalog \"%s\" for locale \"%s\"\n"


--- NEW FILE man.lang ---
%lang(bg)   /usr/share/locale/bg/LC_MESSAGES/man.mo
%lang(bg)   /usr/share/man/bg/man?
%lang(cs)   /usr/share/locale/cs/LC_MESSAGES/man.mo
%lang(cs)   /usr/share/man/cs/man?
%lang(da)   /usr/share/locale/da/LC_MESSAGES/man.mo
%lang(da)   /usr/share/man/da/man?
%lang(de)   /usr/share/locale/de/LC_MESSAGES/man.mo
%lang(de)   /usr/share/man/de/man?
%lang(el)   /usr/share/locale/el/LC_MESSAGES/man.mo
%lang(el)   /usr/share/man/el/man?
%lang(en)   /usr/share/locale/en/LC_MESSAGES/man.mo
%lang(en)   /usr/share/man/en/man?
%lang(es)   /usr/share/locale/es/LC_MESSAGES/man.mo
%lang(es)   /usr/share/man/es/man?
%lang(fi)   /usr/share/locale/fi/LC_MESSAGES/man.mo
%lang(fi)   /usr/share/man/fi/man?
%lang(fr)   /usr/share/locale/fr/LC_MESSAGES/man.mo
%lang(fr)   /usr/share/man/fr/man?
%lang(hr)   /usr/share/locale/hr/LC_MESSAGES/man.mo
%lang(hr)   /usr/share/man/hr/man?
%lang(it)   /usr/share/locale/it/LC_MESSAGES/man.mo
%lang(it)   /usr/share/man/it/man?
%lang(ja)   /usr/share/locale/ja/LC_MESSAGES/man.mo
%lang(ja)   /usr/share/man/ja/man?
%lang(ko)   /usr/share/locale/ko/LC_MESSAGES/man.mo
%lang(ko)   /usr/share/man/ko/man?
%lang(nl)   /usr/share/locale/nl/LC_MESSAGES/man.mo
%lang(nl)   /usr/share/man/nl/man?
%lang(pl)   /usr/share/locale/pl/LC_MESSAGES/man.mo
%lang(pl)   /usr/share/man/pl/man?
%lang(pt)   /usr/share/locale/pt/LC_MESSAGES/man.mo
%lang(pt)   /usr/share/man/pt/man?
%lang(ro)   /usr/share/locale/ro/LC_MESSAGES/man.mo
%lang(ro)   /usr/share/man/ro/man?
%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?



Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- man.spec	16 Apr 2008 08:53:10 -0000	1.64
+++ man.spec	15 May 2008 11:12:23 -0000	1.65
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -14,6 +14,7 @@
 Source2: makewhatis.crondaily
 Source3: mess.ru
 Source4: man-cmp.sh
+Source5: man.lang
 Patch1: man-1.5m2-confpath.patch
 Patch2: man-1.5h1-make.patch
 Patch6: man-1.5m2-apropos.patch
@@ -31,6 +32,7 @@
 Patch27: man-1.6e-chmod.patch
 Patch28: man-1.6f-i18n_makewhatis_2.patch
 Patch29: man-1.6f-fr_translation.patch
+Patch30: man-1.6f-loc.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -68,8 +70,10 @@
 %patch27 -p1 -b .chmod
 %patch28 -p1 -b .i18n_makewhatis2
 %patch29 -p1 -b .fr
+%patch30 -p1 -b .loc
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
+cp -f %{SOURCE5} ./
 
 for src in $(find msgs -type f -name 'mess.[a-z][a-z]'); do
    lang=$(echo ${src} | sed -r 's;.*([a-z]{2})$;\1;')
@@ -187,12 +191,10 @@
         mkdir -p $RPM_BUILD_ROOT/%{cache}/X11R6/cat$i
 done
 
-#strip $RPM_BUILD_ROOT/usr/bin/man 
 
 # added man2html stuff
 cd man2html
 make install DESTDIR=$RPM_BUILD_ROOT
-#strip -R .comment $RPM_BUILD_ROOT/usr/bin/man2html
 
 for src in $(find $RPM_BUILD_ROOT%{_mandir} -type f -name '*.[1-9n]'); do
    gzip -9 ${src}
@@ -200,13 +202,15 @@
 
 # symlinks for manpath
 ( cd $RPM_BUILD_ROOT
-  ln -s man ./usr/bin/manpath
+  ln -s man .%{_bindir}/manpath
   ln -s man.1.gz .%{_mandir}/man1/manpath.1.gz
 )
 
-# move makewhatis, allow others to execute
-#mv $RPM_BUILD_ROOT%{_sbindir}/makewhatis $RPM_BUILD_ROOT%{_bindir}
-#chmod a+x $RPM_BUILD_ROOT%{_bindir}/makewhatis
+# 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
+done
 
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_bindir}/man2dvi
@@ -229,103 +233,25 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %config(noreplace) /etc/cron.weekly/makewhatis.cron
 %config(noreplace) /etc/cron.daily/makewhatis.cron
+%config(noreplace) /etc/man.config
 %if %{usecache}
 %attr(2755,root,man)    /usr/bin/man
 %else
 %attr(0755,root,root)   /usr/bin/man
 %endif
-/usr/bin/manpath
-/usr/bin/apropos
-/usr/bin/whatis
-/usr/sbin/makewhatis
-/%{_libexecdir}/man-cmp.sh
-%config(noreplace) /etc/man.config
+%{_bindir}/manpath
+%{_bindir}/apropos
+%{_bindir}/whatis
+%{_bindir}/man2html
+%{_sbindir}/makewhatis
+%{_libexecdir}/man-cmp.sh
 %{_mandir}/man5/man.config.5*
-%{_mandir}/man1/whatis.1*
-%{_mandir}/man1/man.1*
-%{_mandir}/man1/manpath.1*
-%{_mandir}/man1/apropos.1*
-%{_mandir}/man1/man2html.1*
+%{_mandir}/man1/*
 %{_mandir}/man8/makewhatis.8*
-/usr/bin/man2html
-%lang(bg) %dir /usr/share/locale/bg
-%lang(bg) /usr/share/locale/bg/man
-%lang(bg) %dir /usr/share/man/bg
-%lang(bg) /usr/share/man/bg/man?
-%lang(cs) %dir /usr/share/locale/cs
-%lang(cs) /usr/share/locale/cs/man
-%lang(cs) %dir /usr/share/man/cs
-%lang(cs) /usr/share/man/cs/man?
-%lang(da) %dir /usr/share/locale/da
-%lang(da) /usr/share/locale/da/man
-%lang(da) %dir /usr/share/man/da
-%lang(da) /usr/share/man/da/man?
-%lang(de) %dir /usr/share/locale/de
-%lang(de) /usr/share/locale/de/man
-%lang(de) %dir /usr/share/man/de
-%lang(de) /usr/share/man/de/man?
-%lang(el) %dir /usr/share/locale/el
-%lang(el) /usr/share/locale/el/man
-%lang(el) %dir /usr/share/man/el
-%lang(el) /usr/share/man/el/man?
-%lang(en) %dir /usr/share/locale/en
-%lang(en) /usr/share/locale/en/man
-%lang(en) %dir /usr/share/man/en
-%lang(en) /usr/share/man/en/man?
-%lang(es) %dir /usr/share/locale/es
-%lang(es) /usr/share/locale/es/man
-%lang(es) %dir /usr/share/man/es
-%lang(es) /usr/share/man/es/man?
-%lang(fi) %dir /usr/share/locale/fi
-%lang(fi) /usr/share/locale/fi/man
-%lang(fi) %dir /usr/share/man/fi
-%lang(fi) /usr/share/man/fi/man?
-%lang(fr) %dir /usr/share/locale/fr
-%lang(fr) /usr/share/locale/fr/man
-%lang(fr) %dir /usr/share/man/fr
-%lang(fr) /usr/share/man/fr/man?
-%lang(hr) %dir /usr/share/locale/hr
-%lang(hr) /usr/share/locale/hr/man
-%lang(hr) %dir /usr/share/man/hr
-%lang(hr) /usr/share/man/hr/man?
-%lang(it) %dir /usr/share/locale/it
-%lang(it) /usr/share/locale/it/man
-%lang(it) %dir /usr/share/man/it
-%lang(it) /usr/share/man/it/man?
-%lang(ja) %dir /usr/share/locale/ja
-%lang(ja) /usr/share/locale/ja/man
-%lang(ja) %dir /usr/share/man/ja
-%lang(ja) /usr/share/man/ja/man?
-%lang(ko) %dir /usr/share/locale/ko
-%lang(ko) /usr/share/locale/ko/man
-%lang(ko) %dir /usr/share/man/ko
-%lang(ko) /usr/share/man/ko/man?
-%lang(nl) %dir /usr/share/locale/nl
-%lang(nl) /usr/share/locale/nl/man
-%lang(nl) %dir /usr/share/man/nl
-%lang(nl) /usr/share/man/nl/man?
-%lang(pl) %dir /usr/share/locale/pl
-%lang(pl) /usr/share/locale/pl/man
-%lang(pl) %dir /usr/share/man/pl
-%lang(pl) /usr/share/man/pl/man?
-%lang(pt) %dir /usr/share/locale/pt
-%lang(pt) /usr/share/locale/pt/man
-%lang(pt) %dir /usr/share/man/pt
-%lang(pt) /usr/share/man/pt/man?
-%lang(ro) %dir /usr/share/locale/ro
-%lang(ro) /usr/share/locale/ro/man
-%lang(ro) %dir /usr/share/man/ro
-%lang(ro) /usr/share/man/ro/man?
-%lang(sl) %dir /usr/share/locale/sl
-%lang(sl) /usr/share/locale/sl/man
-%lang(sl) %dir /usr/share/man/sl
-%lang(sl) /usr/share/man/sl/man?
-%lang(ru) %dir /usr/share/locale/ru
-%lang(ru) /usr/share/locale/ru/man
 %attr(0755,root,root)   %dir %{cache}
 %attr(0755,root,man)    %dir %{cache}/cat[123456789n]
 %attr(0755,root,man)    %dir %{cache}/local
@@ -334,6 +260,11 @@
 %attr(0755,root,man)    %dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Wed May 14 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-6
+- Resolves: #439314
+  move locale files
+- spec file cleanup
+
 * Wed Apr 16 2008 Ivana Varekova <varekova at redhat.com> - 1.6f -5
 - Resolves: #442192
   fix fr translation


