rpms/man/devel man-1.6f-groff-1.20.patch, NONE, 1.1 man.lang, 1.3, 1.4 man.spec, 1.88, 1.89

[Ivana Varekova]

Author: varekova

Update of /cvs/pkgs/rpms/man/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18697

Modified Files:
	man.lang man.spec 
Added Files:
	man-1.6f-groff-1.20.patch 
Log Message:
- Resolves: #574707
  New groff incorrectly formats local (russian...) man pages 
  (patch by Jan Vcelak)
- Resolves: #569424
  Wrong directory ownership


man-1.6f-groff-1.20.patch:
 man.c |   35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

--- NEW FILE man-1.6f-groff-1.20.patch ---
Patch for man to work with new version of groff (1.20) which needs
preprocessing UTF-8 input files. (Ugly patch, but it doesn't modify
configuration file.)

Author: Jan Vcelak <jvcelak at redhat.com>
Fixes: #574707 New groff incorrectly formats local (russian...) man pages

diff -ur man-1.6f.original/src/man.c man-1.6f/src/man.c
--- man-1.6f.original/src/man.c	2010-03-18 17:45:54.151407967 +0100
+++ man-1.6f/src/man.c	2010-03-19 10:19:21.395058567 +0100
@@ -448,21 +448,27 @@
 }
 
 static void
+add_command (const char *cmd, const char *file, char *buf, int buflen) {
+	if (cmd && *cmd) {
+		if (*buf == 0) {
+			if (strlen(cmd) + strlen(file) + 2 > buflen)
+				return;
+			strcpy(buf, cmd);
+			strcat(buf, " ");
+			strcat(buf, file);
+		} else {
+			if (strlen(cmd) + strlen(buf) + 4 > buflen)
+				return;
+			strcat(buf, " | ");
+			strcat(buf, cmd);
+		}
+	}
+}
+
+static void
 add_directive (const char *d, const char *file, char *buf, int buflen) {
-     if ((d = getval(d)) != 0 && *d) {
-	  if (*buf == 0) {
-	       if (strlen(d) + strlen(file) + 2 > buflen)
-		    return;
-	       strcpy (buf, d);
-	       strcat (buf, " ");
-	       strcat (buf, file);
-	  } else {
-	       if (strlen(d) + strlen(buf) + 4 > buflen)
-		    return;
-	       strcat (buf, " | ");
-	       strcat (buf, d);
-	  }
-     }
+	d = getval(d);
+	add_command(d, file, buf, buflen);
 }
 
 static int
@@ -568,6 +574,7 @@
 	       if (debug)
 		    gripe (FOUND_TBL);
 	       tbl_found++;
+		   add_command ("preconv -e UTF-8", file, buf, buflen);
 	       add_directive ("TBL", file, buf, buflen);
 	       break;
 


Index: man.lang
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.lang,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- man.lang	12 Feb 2009 12:44:39 -0000	1.3
+++ man.lang	19 Mar 2010 10:17:01 -0000	1.4
@@ -1,38 +1,38 @@
 %lang(bg)   /usr/share/locale/bg/LC_MESSAGES/man
-%lang(bg)   /usr/share/man/bg
+%lang(bg)   /usr/share/man/bg/man*/*
 %lang(cs)   /usr/share/locale/cs/LC_MESSAGES/man
-%lang(cs)   /usr/share/man/cs
+%lang(cs)   /usr/share/man/cs/man*/*
 %lang(da)   /usr/share/locale/da/LC_MESSAGES/man
-%lang(da)   /usr/share/man/da
+%lang(da)   /usr/share/man/da/man*/*
 %lang(de)   /usr/share/locale/de/LC_MESSAGES/man
-%lang(de)   /usr/share/man/de
+%lang(de)   /usr/share/man/de/man*/*
 %lang(el)   /usr/share/locale/el/LC_MESSAGES/man
-%lang(el)   /usr/share/man/el
+%lang(el)   /usr/share/man/el/man*/*
 %lang(en)   /usr/share/locale/en/LC_MESSAGES/man
-%lang(en)   /usr/share/man/en
+%lang(en)   /usr/share/man/en/man*/*
 %lang(es)   /usr/share/locale/es/LC_MESSAGES/man
-%lang(es)   /usr/share/man/es
+%lang(es)   /usr/share/man/es/man*/*
 %lang(fi)   /usr/share/locale/fi/LC_MESSAGES/man
-%lang(fi)   /usr/share/man/fi
+%lang(fi)   /usr/share/man/fi/man*/*
 %lang(fr)   /usr/share/locale/fr/LC_MESSAGES/man
-%lang(fr)   /usr/share/man/fr
+%lang(fr)   /usr/share/man/fr/man*/*
 %lang(hr)   /usr/share/locale/hr/LC_MESSAGES/man
-%lang(hr)   /usr/share/man/hr
+%lang(hr)   /usr/share/man/hr/man*/*
 %lang(it)   /usr/share/locale/it/LC_MESSAGES/man
-%lang(it)   /usr/share/man/it
+%lang(it)   /usr/share/man/it/man*/*
 %lang(ja)   /usr/share/locale/ja/LC_MESSAGES/man
-%lang(ja)   /usr/share/man/ja
+%lang(ja)   /usr/share/man/ja/man*/*
 %lang(ko)   /usr/share/locale/ko/LC_MESSAGES/man
-%lang(ko)   /usr/share/man/ko
+%lang(ko)   /usr/share/man/ko/man*/*
 %lang(nl)   /usr/share/locale/nl/LC_MESSAGES/man
-%lang(nl)   /usr/share/man/nl
+%lang(nl)   /usr/share/man/nl/man*/*
 %lang(pl)   /usr/share/locale/pl/LC_MESSAGES/man
-%lang(pl)   /usr/share/man/pl
+%lang(pl)   /usr/share/man/pl/man*/*
 %lang(pt)   /usr/share/locale/pt/LC_MESSAGES/man
-%lang(pt)   /usr/share/man/pt
+%lang(pt)   /usr/share/man/pt/man*/*
 %lang(ro)   /usr/share/locale/ro/LC_MESSAGES/man
-%lang(ro)   /usr/share/man/ro
+%lang(ro)   /usr/share/man/ro/man*/*
 %lang(ru)   /usr/share/locale/ru/LC_MESSAGES/man
-%lang(sl)   /usr/share/man/sl
+%lang(sl)   /usr/share/man/sl/man*/*
 %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.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- man.spec	17 Feb 2010 06:41:10 -0000	1.88
+++ man.spec	19 Mar 2010 10:17:01 -0000	1.89
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: GPLv2
 Group: System Environment/Base
 URL: http://primates.ximian.com/~flucifredi/man/
@@ -42,10 +42,11 @@ Patch39: man-1.6f-man2html-suffixes.patc
 # 542852 -  'man cut cut' throws an error
 Patch40: man-1.6f-diff.patch
 Patch41: man-1.6f-variable.patch
+Patch42: man-1.6f-groff-1.20.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
-Requires: less, groff >= 1.18, nroff-i18n, findutils, mktemp >= 1.5-2.1.5x
+Requires: less, groff >= 1.20, nroff-i18n, findutils, mktemp >= 1.5-2.1.5x
 Requires: bzip2, gzip, rpm, lzma
 BuildRequires: less, groff
 
@@ -90,6 +91,7 @@ primary way to find documentation on a L
 %patch39 -p1 -b .suff
 %patch40 -p1 -b .diff
 %patch41 -p1 -b .vari
+%patch42 -p1 -b .groff_120
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -274,6 +276,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Mar 19 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 1.6f-28
+- Resolves: #574707
+  New groff incorrectly formats local (russian...) man pages 
+  (patch by Jan Vcelak)
+- Resolves: #569424
+  Wrong directory ownership
+
 * Wed Feb 17 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 1.6f-27
 - add the documentation