Accepting request 39208 from Base:System

Copy from Base:System/man based on submit request 39208 from user WernerFink

OBS-URL: https://build.opensuse.org/request/show/39208
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/man?expand=0&rev=35
This commit is contained in:
OBS User autobuild 2010-05-03 21:01:53 +00:00 committed by Git OBS Bridge
commit a7970e21bf
6 changed files with 15 additions and 15 deletions

View File

@ -1,7 +1,5 @@
Index: src/man.c --- src/man.c
=================================================================== +++ src/man.c 2007-07-18 12:45:24.091833039 +0000
--- src/man.c.orig
+++ src/man.c
@@ -2031,21 +2031,23 @@ static void format_display (pipeline *de @@ -2031,21 +2031,23 @@ static void format_display (pipeline *de
if (!status) if (!status)
break; break;

View File

@ -1,7 +1,5 @@
Index: src/man.c --- src/man.c
=================================================================== +++ src/man.c 2006-06-13 14:01:19.000000000 +0000
--- src/man.c.orig
+++ src/man.c
@@ -1142,7 +1142,7 @@ static inline const char *is_section (co @@ -1142,7 +1142,7 @@ static inline const char *is_section (co
{ {
const char **vs; const char **vs;

View File

@ -1,6 +1,6 @@
--- src/man.c --- src/man.c
+++ src/man.c 2008-11-28 13:12:22.171541000 +0100 +++ src/man.c 2008-11-28 13:12:22.171541000 +0100
@@ -3223,12 +3223,131 @@ static int locate_page (const char *manp @@ -3223,12 +3223,132 @@ static int locate_page (const char *manp
return found; return found;
} }
@ -50,6 +50,7 @@
+ +
+ fputs("Man: ", stderr); + fputs("Man: ", stderr);
+ fputs(_("find all matching manual pages"), stderr); + fputs(_("find all matching manual pages"), stderr);
+ fputs(" (set MAN_POSIXLY_CORRECT to avoid this)", stderr);
+ fputc('\n', stderr); + fputc('\n', stderr);
+ +
+ lext = NULL; + lext = NULL;
@ -132,7 +133,7 @@
global_manpath = is_global_mandir (candp->path); global_manpath = is_global_mandir (candp->path);
if (!global_manpath) if (!global_manpath)
drop_effective_privs (); drop_effective_privs ();
@@ -3250,9 +3369,51 @@ static int display_pages (struct candida @@ -3250,9 +3370,51 @@ static int display_pages (struct candida
regain_effective_privs (); regain_effective_privs ();
if (found && !findall) if (found && !findall)

View File

@ -1,7 +1,5 @@
Index: lib/pipeline.c --- lib/pipeline.c
=================================================================== +++ lib/pipeline.c 2008-11-21 10:53:20.554776039 +0000
--- lib/pipeline.c.orig
+++ lib/pipeline.c
@@ -54,6 +54,20 @@ @@ -54,6 +54,20 @@
# include "zio.h" # include "zio.h"
#endif /* HAVE_ZIO */ #endif /* HAVE_ZIO */

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Apr 30 13:49:23 CEST 2010 - werner@suse.de
- Add a hint how to avoid the listall default behaviour of man
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Dec 13 17:02:44 CET 2009 - jengelh@medozas.de Sun Dec 13 17:02:44 CET 2009 - jengelh@medozas.de

View File

@ -31,7 +31,7 @@ BuildRequires: gettext-runtime gettext-tools
BuildRequires: gettext gettext-devel BuildRequires: gettext gettext-devel
%endif %endif
Version: 2.5.2 Version: 2.5.2
Release: 23 Release: 24
Summary: A Program for Displaying man Pages Summary: A Program for Displaying man Pages
License: GPLv2+ License: GPLv2+
Url: https://savannah.nongnu.org/projects/man-db Url: https://savannah.nongnu.org/projects/man-db