rpms/man/devel man-1.6b-i18n_nroff.patch, 1.2, 1.3 man.spec, 1.53, 1.54

[fedora-cvs-commits at redhat.com]

Author: varekova

Update of /cvs/dist/rpms/man/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23788

Modified Files:
	man-1.6b-i18n_nroff.patch man.spec 
Log Message:
- Resolves: 221868
  man use incorrect groff option
- spec file cleanup



man-1.6b-i18n_nroff.patch:
 configure       |   19 +++------
 src/man.c       |  112 ++++++++++++++++++++++++++++++++++++++++----------------
 src/man.conf.in |    4 --
 src/paths.h.in  |    2 -
 4 files changed, 88 insertions(+), 49 deletions(-)

Index: man-1.6b-i18n_nroff.patch
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man-1.6b-i18n_nroff.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- man-1.6b-i18n_nroff.patch	27 Feb 2006 13:46:03 -0000	1.2
+++ man-1.6b-i18n_nroff.patch	9 Jan 2007 09:36:11 -0000	1.3
@@ -16,10 +16,10 @@
      if test $Fnroff = "missing"
      then
 -      nroff="nroff -Tlatin1 -mandoc"
-+      nroff="nroff --legacy NROFF_OLD_CHARSET -mandoc 2>/dev/null"
++      nroff="nroff  -mandoc 2>/dev/null"
      else
 -      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff --legacy NROFF_OLD_CHARSET -mandoc 2>/dev/null"
++      nroff="$Fnroff -mandoc 2>/dev/null"
      fi
      troff="troff -mandoc"
      echo "Warning: could not find groff"
@@ -30,7 +30,7 @@
 +      nroff="$Fgroff -Tutf8 -mandoc"
      else
 -      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff --legacy NROFF_OLD_CHARSET -mandoc 2>/dev/null"
++      nroff="$Fnroff -mandoc 2>/dev/null"
      fi
      troff="$Fgroff -Tps -mandoc"
 -    jnroff="$Fgroff -Tnippon -mandocj"


Index: man.spec
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- man.spec	11 Dec 2006 14:21:19 -0000	1.53
+++ man.spec	9 Jan 2007 09:36:11 -0000	1.54
@@ -1,12 +1,14 @@
 %define usecache 0
 %define cache /var/cache/man
 
-Summary: A set of documentation tools: man, apropos and whatis.
+Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6e
-Release: 1%{?dist}
+Release: 2%{?dist}
+
 License: GPL
 Group: System Environment/Base
+URL: http://primates.ximian.com/~flucifredi/man/
 Source0: http://primates.ximian.com/~flucifredi/man/man-%{version}.tar.gz
 Source1: makewhatis.cronweekly
 Source2: makewhatis.crondaily
@@ -27,7 +29,7 @@
 Patch26: man-1.6d-updates.patch
 
 Buildroot: %{_tmppath}/%{name}-root
-PreReq: coreutils
+Requires: coreutils
 Requires: less, groff >= 1.18, nroff-i18n, findutils, mktemp >= 1.5-2.1.5x
 Requires: bzip2, gzip, diffutils, rpm
 BuildRequires: less, groff, diffutils, bzip2, gzip, coreutils
@@ -60,7 +62,7 @@
 %patch25 -p1 -b .dash
 %patch26 -p1 -b .upd
 
-cp -f %{SOURCE3} msgs	# replace bad ru trans
+cp -f %{SOURCE3} msgs   # replace bad ru trans
 
 for src in $(find msgs -type f -name 'mess.[a-z][a-z]'); do
    lang=$(echo ${src} | sed -r 's;.*([a-z]{2})$;\1;')
@@ -91,7 +93,7 @@
 done
 
 %build
-./configure -default -confdir /etc +fhs +lang all
+./configure -default  -confdir /etc +fhs +lang all
 
 find . -type f|xargs perl -pi -e 's,man\.conf \(5\),man.config (5),g'
 for i in $(find man -name man.conf.man); do
@@ -101,7 +103,7 @@
 # HACK: Make output default to using -c; otherwise it appears broken.
 perl -pi -e "s/nroff /nroff -c /" conf_script
 
-touch Makefile	# make sure Make thinks we ran configure
+touch Makefile   # make sure Make thinks we ran configure
 make CC="gcc $RPM_OPT_FLAGS"
 %if %{usecache}
 perl -pi -e "s,^NOCACHE,# NOCACHE,g" src/man.conf
@@ -165,9 +167,9 @@
 mkdir -p $RPM_BUILD_ROOT/%{cache}/local
 mkdir -p $RPM_BUILD_ROOT/%{cache}/X11R6
 for i in 1 2 3 4 5 6 7 8 9 n; do
-	mkdir -p $RPM_BUILD_ROOT/%{cache}/cat$i
-	mkdir -p $RPM_BUILD_ROOT/%{cache}/local/cat$i
-	mkdir -p $RPM_BUILD_ROOT/%{cache}/X11R6/cat$i
+        mkdir -p $RPM_BUILD_ROOT/%{cache}/cat$i
+        mkdir -p $RPM_BUILD_ROOT/%{cache}/local/cat$i
+        mkdir -p $RPM_BUILD_ROOT/%{cache}/X11R6/cat$i
 done
 
 #strip $RPM_BUILD_ROOT/usr/bin/man 
@@ -217,7 +219,7 @@
 %config /etc/cron.weekly/makewhatis.cron
 %config /etc/cron.daily/makewhatis.cron
 %if %{usecache}
-%attr(2755,root,man)	/usr/bin/man
+%attr(2755,root,man)    /usr/bin/man
 %else
 %attr(0755,root,root)   /usr/bin/man
 %endif
@@ -308,14 +310,19 @@
 %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(0775,root,man)	%dir %{cache}/cat[123456789n]
-%attr(0775,root,man)	%dir %{cache}/local
-%attr(0775,root,man)	%dir %{cache}/local/cat[123456789n]
-%attr(0775,root,man)	%dir %{cache}/X11R6
-%attr(0775,root,man)	%dir %{cache}/X11R6/cat[123456789n]
+%attr(0755,root,root)   %dir %{cache}
+%attr(0775,root,man)    %dir %{cache}/cat[123456789n]
+%attr(0775,root,man)    %dir %{cache}/local
+%attr(0775,root,man)    %dir %{cache}/local/cat[123456789n]
+%attr(0775,root,man)    %dir %{cache}/X11R6
+%attr(0775,root,man)    %dir %{cache}/X11R6/cat[123456789n]
 
 %changelog
+* Tue Jan  9 2007 Ivana Varekova <varekova at redhat.com> - 1.6e-2
+- Resolves: 221868
+  man use incorrect groff option
+- spec file cleanup
+
 * Mon Dec 11 2006 Ivana Varekova <varekova at redhat.com> - 1.6e-1
 - update to 1.6e
 
@@ -543,7 +550,7 @@
 * Thu Nov 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 1.5j-1
 - Update to 1.5j
 
-* Fri Aug 31 2001 Trond Eivind Glomsrød <teg at redhat.com> 1.5i2-6
+* Fri Aug 31 2001 Trond Eivind Glomsrød <teg at redhat.com> 1.5i2-6
 - set LC_CTYPE, not just LC_MESSAGES. That way, the messages 
   requested can also be displayed (#52978)