rpms/man/devel man-1.6f-tty.patch,NONE,1.1 man.spec,1.65,1.66
Ivana Varekova (varekova)
fedora-extras-commits at redhat.com
Mon Jun 2 12:11:06 UTC 2008
Author: varekova
Update of /cvs/pkgs/rpms/man/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28111
Modified Files:
man.spec
Added Files:
man-1.6f-tty.patch
Log Message:
- Resolves: #448049
Error messages will exhibit when quit from mount man page
man-1.6f-tty.patch:
--- NEW FILE man-1.6f-tty.patch ---
diff -up man-1.6f/src/man.c.pom man-1.6f/src/man.c
--- man-1.6f/src/man.c.pom 2008-06-02 13:52:45.000000000 +0200
+++ man-1.6f/src/man.c 2008-06-02 13:55:08.000000000 +0200
@@ -923,8 +923,11 @@ display_man_file(const char *path, const
if (do_troff)
command = my_xsprintf ("(cd \"%S\" && %s)", path, roff_command);
else
- command = my_xsprintf ("(cd \"%S\" && %s | %s)", path,
+ if (isatty(1))
+ command = my_xsprintf ("(cd \"%S\" && %s | %s)", path,
roff_command, pager);
+ else
+ command = my_xsprintf ("(cd \"%S\" && %s)", path, roff_command);
return !do_system_command (command, 0);
}
Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- man.spec 15 May 2008 11:12:23 -0000 1.65
+++ man.spec 2 Jun 2008 12:10:21 -0000 1.66
@@ -4,7 +4,7 @@
Summary: A set of documentation tools: man, apropos and whatis
Name: man
Version: 1.6f
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -33,6 +33,7 @@
Patch28: man-1.6f-i18n_makewhatis_2.patch
Patch29: man-1.6f-fr_translation.patch
Patch30: man-1.6f-loc.patch
+Patch31: man-1.6f-tty.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: coreutils
@@ -71,6 +72,7 @@
%patch28 -p1 -b .i18n_makewhatis2
%patch29 -p1 -b .fr
%patch30 -p1 -b .loc
+%patch31 -p1 -b .tty
cp -f %{SOURCE3} msgs # replace bad ru trans
cp -f %{SOURCE5} ./
@@ -260,6 +262,10 @@
%attr(0755,root,man) %dir %{cache}/X11R6/cat[123456789n]
%changelog
+* 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
+
* Wed May 14 2008 Ivana Varekova <varekova at redhat.com> - 1.6f-6
- Resolves: #439314
move locale files
More information about the scm-commits
mailing list