pool/man
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 26365 from home:jengelh:branches:Base:System

Browse Source 
Copy from home:jengelh:branches:Base:System/man via accept of submit request 26365 revision 2.
Request was accepted with message:
thanks

OBS-URL: https://build.opensuse.org/request/show/26365
OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=11
This commit is contained in:
Pavol Rusnak 2009-12-13 23:07:51 +00:00 committed by Git OBS Bridge
parent b34e937673
commit a1a0a03d78
5 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
man-db-2.4.3-firefox.dif
View File

@ -1,6 +1,8 @@
--- src/man.c Index: src/man.c
+++ src/man.c 2007-07-18 14:45:24.091833039 +0200 ===================================================================
@@ -2280,21 +2280,23 @@ static void format_display (pipeline *fo --- src/man.c.orig
+++ src/man.c
@@ -2031,21 +2031,23 @@ static void format_display (pipeline *de
if (!status) if (!status)
break; break;
} }
@ -27,4 +29,4 @@
+ html_pager); + html_pager);
} else } else
#endif /* TROFF_IS_GROFF */ #endif /* TROFF_IS_GROFF */
if (format_cmd) { /* TODO: check format_cmd status too? */

14
man-db-2.4.3-section.dif
View File

@ -1,6 +1,8 @@
--- src/man.c Index: src/man.c
+++ src/man.c 2006-06-13 16:01:19.000000000 +0200 ===================================================================
@@ -1312,7 +1312,7 @@ --- src/man.c.orig
+++ src/man.c
@@ -1142,7 +1142,7 @@ static inline const char *is_section (co
{ {
const char **vs; const char **vs;
@ -8,8 +10,8 @@
+ for (vs = section_list; vs && *vs; vs++) { + for (vs = section_list; vs && *vs; vs++) {
if (STREQ (*vs, name)) if (STREQ (*vs, name))
return name; return name;
if (strlen (*vs) == 1 && STRNEQ (*vs, name, 1)) /* allow e.g. 3perl but disallow 8139too and libfoo */
@@ -2714,7 +2714,8 @@ @@ -2565,7 +2565,8 @@ static int compare_candidates (const str
* section_list. * section_list.
*/ */
const char **sp; const char **sp;
@ -19,7 +21,7 @@
if (!*(*sp + 1)) { if (!*(*sp + 1)) {
/* No extension */ /* No extension */
if (!sec_left && **sp == *(left->ext)) if (!sec_left && **sp == *(left->ext))
@@ -3397,7 +3398,7 @@ @@ -3209,7 +3210,7 @@ static int man (const char *name, int *f
} else { } else {
const char **sp; const char **sp;

12
man-db-2.5.2-fastpipe.dif
View File

@ -1,8 +1,10 @@
--- lib/pipeline.c Index: lib/pipeline.c
+++ lib/pipeline.c 2008-11-21 11:53:20.554776039 +0100 ===================================================================
@@ -50,6 +50,20 @@ --- lib/pipeline.c.orig
#include "error.h" +++ lib/pipeline.c
#include "pipeline.h" @@ -54,6 +54,20 @@
# include "zio.h"
#endif /* HAVE_ZIO */
+#ifdef __linux__ +#ifdef __linux__
+# include <sys/socket.h> +# include <sys/socket.h>

10
man.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sun Dec 13 17:02:44 CET 2009 - jengelh@medozas.de
- enable parallel building
-------------------------------------------------------------------
Tue Nov 3 19:09:30 UTC 2009 - coolo@novell.com
- updated patches to apply with fuzz=0
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 22 00:19:11 CEST 2009 - crrodriguez@suse.de Tue Sep 22 00:19:11 CEST 2009 - crrodriguez@suse.de

4
man.spec
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: 21 Release: 22
Summary: A Program for Displaying man Pages Summary: A Program for Displaying man Pages
License: GPL v2 or later License: GPL v2 or later
Url: https://savannah.nongnu.org/projects/man-db Url: https://savannah.nongnu.org/projects/man-db
@ -150,7 +150,7 @@ Authors:
--with-config-file=%{_sysconfdir}/manpath.config \ --with-config-file=%{_sysconfdir}/manpath.config \
--without-included-gettext \ --without-included-gettext \
--with-sections="${SEC}" --with-sections="${SEC}"
make nls=all make %{?jobs:-j%jobs} nls=all
for man in $(find man/ -type f -a -name '*.man[0-9]'); do for man in $(find man/ -type f -a -name '*.man[0-9]'); do
pp="$(head -n 1 $man)" pp="$(head -n 1 $man)"
case "$pp" in case "$pp" in