rpm/man
SHA256
1
0
Fork 0
forked from pool/man
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/man?expand=0&rev=3

Browse Source
This commit is contained in:
OBS User unknown 2007-02-09 15:58:14 +00:00 committed by Git OBS Bridge
parent 5b6f9a0e49
commit 682770e74a
3 changed files with 71 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
man-db-2.4.3.dif
View File

@ -1,6 +1,4 @@
Index: .pkgextract --- .pkgextract
===================================================================
--- /dev/null
+++ .pkgextract +++ .pkgextract
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+bzcat ../man-db-2.4.3-3.diff.bz2 | patch -p1 -s --suffix=.debian +bzcat ../man-db-2.4.3-3.diff.bz2 | patch -p1 -s --suffix=.debian
@ -9,9 +7,7 @@ Index: .pkgextract
+patch -p0 -s --suffix=.sect < ../man-db-2.4.3-section.dif +patch -p0 -s --suffix=.sect < ../man-db-2.4.3-section.dif
+patch -p0 -s --suffix=.secu2 < ../man-db-2.4.1-security2.dif +patch -p0 -s --suffix=.secu2 < ../man-db-2.4.1-security2.dif
+patch -p0 -s --suffix=.secu4 < ../man-db-2.4.1-security4.dif +patch -p0 -s --suffix=.secu4 < ../man-db-2.4.1-security4.dif
Index: GNUmakefile.in --- GNUmakefile.in
===================================================================
--- GNUmakefile.in.orig
+++ GNUmakefile.in +++ GNUmakefile.in
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
# Make targets are: # # Make targets are: #
@ -52,11 +48,9 @@ Index: GNUmakefile.in
# Maintainers may wish to run 'make -C po update-po' beforehand. # Maintainers may wish to run 'make -C po update-po' beforehand.
# This is not done automatically, since the .po files are stored # This is not done automatically, since the .po files are stored
# in revision control. # in revision control.
Index: Makefile.Linux --- Makefile.Linux
===================================================================
--- /dev/null
+++ Makefile.Linux +++ Makefile.Linux
@@ -0,0 +1,71 @@ @@ -0,0 +1,75 @@
+# +#
+# +#
+# +#
@ -69,6 +63,7 @@ Index: Makefile.Linux
+# +#
+ +
+ARCH = $(shell uname -m | sed 's@\(i\)[34567]\(86\)@\13\2@') +ARCH = $(shell uname -m | sed 's@\(i\)[34567]\(86\)@\13\2@')
+ID = $(shell id -u)
+CFLAGS = $(RPM_OPT_FLAGS) -funroll-loops -pipe \ +CFLAGS = $(RPM_OPT_FLAGS) -funroll-loops -pipe \
+ -D_GNU_SOURCE -D_SVID_SOURCE -Wall + -D_GNU_SOURCE -D_SVID_SOURCE -Wall
+MANDIR = /usr/share/man +MANDIR = /usr/share/man
@ -98,6 +93,7 @@ Index: Makefile.Linux
+install: +install:
+ mkdir -p $(DESTDIR)/usr/lib/man-db + mkdir -p $(DESTDIR)/usr/lib/man-db
+ mkdir -p $(DESTDIR)/usr/bin + mkdir -p $(DESTDIR)/usr/bin
+ mkdir -p $(DESTDIR)/etc
+ make nls=all install $(flags) DESTDIR=$(DESTDIR) + make nls=all install $(flags) DESTDIR=$(DESTDIR)
+ { \ + { \
+ if test -x $(DESTDIR)/usr/bin/wrapper ; then \ + if test -x $(DESTDIR)/usr/bin/wrapper ; then \
@ -106,10 +102,12 @@ Index: Makefile.Linux
+ mv $(DESTDIR)/usr/bin/wrapper $(DESTDIR)/usr/bin/mandb; \ + mv $(DESTDIR)/usr/bin/wrapper $(DESTDIR)/usr/bin/mandb; \
+ ln -sf mandb $(DESTDIR)/usr/bin/man; \ + ln -sf mandb $(DESTDIR)/usr/bin/man; \
+ fi; \ + fi; \
+ if test $(ID) -eq 0 ; then \
+ chown root.root $(DESTDIR)/usr/bin/mandb $(DESTDIR)/usr/bin/man; \ + chown root.root $(DESTDIR)/usr/bin/mandb $(DESTDIR)/usr/bin/man; \
+ chmod 4711 $(DESTDIR)/usr/bin/mandb $(DESTDIR)/usr/bin/man; \ + chmod 4711 $(DESTDIR)/usr/bin/mandb $(DESTDIR)/usr/bin/man; \
+ chown root.root $(DESTDIR)/usr/lib/man-db/*; \ + chown root.root $(DESTDIR)/usr/lib/man-db/*; \
+ chmod 0711 $(DESTDIR)/usr/lib/man-db/*; \ + chmod 0711 $(DESTDIR)/usr/lib/man-db/*; \
+ fi; \
+ } + }
+ { \ + { \
+ mkdir -p $(DESTDIR)/usr/share/man ; \ + mkdir -p $(DESTDIR)/usr/share/man ; \
@ -128,9 +126,7 @@ Index: Makefile.Linux
+ install -m 644 src/man_db.conf $(DESTDIR)/etc/manpath.config + install -m 644 src/man_db.conf $(DESTDIR)/etc/manpath.config
+ sh ./mk_catdirs $(DESTDIR) + sh ./mk_catdirs $(DESTDIR)
+ +
Index: config.h.in --- config.h.in
===================================================================
--- config.h.in.orig
+++ config.h.in +++ config.h.in
@@ -380,6 +380,9 @@ @@ -380,6 +380,9 @@
/* Define to 1 if `vfork' works. */ /* Define to 1 if `vfork' works. */
@ -142,9 +138,7 @@ Index: config.h.in
/* Define to 1 if you have the `__argz_count' function. */ /* Define to 1 if you have the `__argz_count' function. */
#undef HAVE___ARGZ_COUNT #undef HAVE___ARGZ_COUNT
Index: configure.in --- configure.in
===================================================================
--- configure.in.orig
+++ configure.in +++ configure.in
@@ -10,6 +10,18 @@ AC_CONFIG_HEADER(config.h) @@ -10,6 +10,18 @@ AC_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST AC_CANONICAL_HOST
@ -289,9 +283,7 @@ Index: configure.in
po/Makefile.in) po/Makefile.in)
AC_OUTPUT AC_OUTPUT
Index: mk_catdirs --- mk_catdirs
===================================================================
--- /dev/null
+++ mk_catdirs +++ mk_catdirs
@@ -0,0 +1,24 @@ @@ -0,0 +1,24 @@
+#!/bin/sh +#!/bin/sh
@ -316,11 +308,23 @@ Index: mk_catdirs
+sync +sync
+cd ${OLDPWD} +cd ${OLDPWD}
+ +
+chown man:root -R ${CACHE} +test "$(id -u)" -ne 0 || chown man:daemon -R ${CACHE}
+ +
Index: include/comp_src.h.in --- include/Defines.in
=================================================================== +++ include/Defines.in 2007-02-09 12:58:18.000000000 +0100
--- include/comp_src.h.in.orig @@ -97,7 +97,11 @@ DEFAULT_TARGETS = TAGS all install unins
debug = @debug@
date = @date@
version = @VERSION@
+ifeq ($(shell id -u),0)
man_install_flags = @man_install_flags@
+else
+man_install_flags = -m 0755
+endif
# some path definitions required by the manpage Makefile...
pager="@pager@"
--- include/comp_src.h.in
+++ include/comp_src.h.in +++ include/comp_src.h.in
@@ -53,7 +53,7 @@ struct compression comp_list[] = { @@ -53,7 +53,7 @@ struct compression comp_list[] = {
#endif /* HAVE_GZIP */ #endif /* HAVE_GZIP */
@ -331,9 +335,7 @@ Index: include/comp_src.h.in
{UNCOMPRESS, "Z", NULL}, {UNCOMPRESS, "Z", NULL},
#endif /* HAVE_COMPRESS */ #endif /* HAVE_COMPRESS */
Index: include/manconfig.h.in --- include/manconfig.h.in
===================================================================
--- include/manconfig.h.in.orig
+++ include/manconfig.h.in +++ include/manconfig.h.in
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
MAN_DB_UPDATES - to allow man to update databases MAN_DB_UPDATES - to allow man to update databases
@ -415,9 +417,7 @@ Index: include/manconfig.h.in
#define NOT_FOUND 16 /* No action was taken */ #define NOT_FOUND 16 /* No action was taken */
/* System or user catpaths? Allow bitwise disjunctions of these. */ /* System or user catpaths? Allow bitwise disjunctions of these. */
Index: intl/Makefile.in --- intl/Makefile.in
===================================================================
--- intl/Makefile.in.orig
+++ intl/Makefile.in +++ intl/Makefile.in
@@ -133,7 +133,7 @@ COPYING.LIB-2 gettext.h libgettext.h plu @@ -133,7 +133,7 @@ COPYING.LIB-2 gettext.h libgettext.h plu
@ -428,9 +428,7 @@ Index: intl/Makefile.in
all-no-yes: libgnuintl.$la all-no-yes: libgnuintl.$la
all-no-no: all-no-no:
Index: lib/basename.c --- lib/basename.c
===================================================================
--- lib/basename.c.orig
+++ lib/basename.c +++ lib/basename.c
@@ -37,11 +37,13 @@ @@ -37,11 +37,13 @@
extern char *strrchr(); extern char *strrchr();
@ -447,9 +445,7 @@ Index: lib/basename.c
return base ? base + 1 : filename; return base ? base + 1 : filename;
} }
+#endif +#endif
Index: lib/cleanup.c --- lib/cleanup.c
===================================================================
--- lib/cleanup.c.orig
+++ lib/cleanup.c +++ lib/cleanup.c
@@ -101,7 +101,7 @@ trap_signal (int signo, struct sigaction @@ -101,7 +101,7 @@ trap_signal (int signo, struct sigaction
@ -460,9 +456,7 @@ Index: lib/cleanup.c
return sigaction (signo, &act, oldact); return sigaction (signo, &act, oldact);
} }
Index: lib/xmalloc.c --- lib/xmalloc.c
===================================================================
--- lib/xmalloc.c.orig
+++ lib/xmalloc.c +++ lib/xmalloc.c
@@ -43,6 +43,8 @@ extern void error (int, int, const char @@ -43,6 +43,8 @@ extern void error (int, int, const char
extern void error (); extern void error ();
@ -473,9 +467,7 @@ Index: lib/xmalloc.c
static void * static void *
fixup_null_alloc (size_t n) fixup_null_alloc (size_t n)
{ {
Index: libdb/Makefile.in --- libdb/Makefile.in
===================================================================
--- libdb/Makefile.in.orig
+++ libdb/Makefile.in +++ libdb/Makefile.in
@@ -34,10 +34,7 @@ include $(top_srcdir)/include/Defines @@ -34,10 +34,7 @@ include $(top_srcdir)/include/Defines
.PHONY: $(DEFAULT_TARGETS) .PHONY: $(DEFAULT_TARGETS)
@ -489,9 +481,7 @@ Index: libdb/Makefile.in
# The default programs to build # The default programs to build
ALL = db_store.o db_delete.o db_lookup.o \ ALL = db_store.o db_delete.o db_lookup.o \
Index: libdb/mydbm.h --- libdb/mydbm.h
===================================================================
--- libdb/mydbm.h.orig
+++ libdb/mydbm.h +++ libdb/mydbm.h
@@ -144,7 +144,7 @@ extern __inline__ int btree_nextkeydata( @@ -144,7 +144,7 @@ extern __inline__ int btree_nextkeydata(
# define DB_EXT ".bt" # define DB_EXT ".bt"
@ -502,9 +492,7 @@ Index: libdb/mydbm.h
# define MYDBM_RWOPEN(file) btree_flopen(file, O_RDWR, DBMODE) # define MYDBM_RWOPEN(file) btree_flopen(file, O_RDWR, DBMODE)
# define MYDBM_RDOPEN(file) btree_flopen(file, O_RDONLY, DBMODE) # define MYDBM_RDOPEN(file) btree_flopen(file, O_RDONLY, DBMODE)
# define MYDBM_INSERT(dbf, key, cont) btree_insert(dbf, key, cont) # define MYDBM_INSERT(dbf, key, cont) btree_insert(dbf, key, cont)
Index: man/de_DE.88591/man1/man.man1 --- man/de_DE.88591/man1/man.man1
===================================================================
--- man/de_DE.88591/man1/man.man1.orig
+++ man/de_DE.88591/man1/man.man1 +++ man/de_DE.88591/man1/man.man1
@@ -98,6 +98,7 @@ der Manualseiten gefolgt vom Typ der dor @@ -98,6 +98,7 @@ der Manualseiten gefolgt vom Typ der dor
.TS .TS
@ -514,9 +502,7 @@ Index: man/de_DE.88591/man1/man.man1
1@Ausf𢞴rbare Programme oder Shellbefehle 1@Ausf𢞴rbare Programme oder Shellbefehle
2@Systemaufrufe (Kernelfunktionen) 2@Systemaufrufe (Kernelfunktionen)
3@Bibliotheksaufrufe (Funktionen in System-Bibliotheken) 3@Bibliotheksaufrufe (Funktionen in System-Bibliotheken)
Index: man/es_ES.88591/man1/man.man1 --- man/es_ES.88591/man1/man.man1
===================================================================
--- man/es_ES.88591/man1/man.man1.orig
+++ man/es_ES.88591/man1/man.man1 +++ man/es_ES.88591/man1/man.man1
@@ -101,6 +101,7 @@ del manual y los tipos de p墔inas que co @@ -101,6 +101,7 @@ del manual y los tipos de p墔inas que co
.TS .TS
@ -526,9 +512,7 @@ Index: man/es_ES.88591/man1/man.man1
1@Programas ejecutables y guiones del int廨prete de 1@Programas ejecutables y guiones del int廨prete de
@鏎denes @鏎denes
2@Llamadas del sistema (funciones servidas por el n𠍇leo) 2@Llamadas del sistema (funciones servidas por el n𠍇leo)
Index: man/it_IT.88591/man1/man.man1 --- man/it_IT.88591/man1/man.man1
===================================================================
--- man/it_IT.88591/man1/man.man1.orig
+++ man/it_IT.88591/man1/man.man1 +++ man/it_IT.88591/man1/man.man1
@@ -104,6 +104,7 @@ del manuale seguiti dai tipi di pagine c @@ -104,6 +104,7 @@ del manuale seguiti dai tipi di pagine c
.TS .TS
@ -538,9 +522,7 @@ Index: man/it_IT.88591/man1/man.man1
1@Programmi eseguibili e comandi della shell 1@Programmi eseguibili e comandi della shell
2@Chiamate al sistema (funzioni fornite dal kernel) 2@Chiamate al sistema (funzioni fornite dal kernel)
3@Chiamate alle librerie (funzioni all'interno delle 3@Chiamate alle librerie (funzioni all'interno delle
Index: man/ja_JP.eucJP/man1/man.man1 --- man/ja_JP.eucJP/man1/man.man1
===================================================================
--- man/ja_JP.eucJP/man1/man.man1.orig
+++ man/ja_JP.eucJP/man1/man.man1 +++ man/ja_JP.eucJP/man1/man.man1
@@ -104,6 +104,7 @@ @@ -104,6 +104,7 @@
.TS .TS
@ -550,9 +532,7 @@ Index: man/ja_JP.eucJP/man1/man.man1
1@撢墊皿伕弘仿丞引凶反扑尼伙及戊穴件玉 1@撢墊皿伕弘仿丞引凶反扑尼伙及戊穴件玉
2@扑旦氾丞戊□伙 (市□生伙互羼間允月楮醒) 2@扑旦氾丞戊□伙 (市□生伙互羼間允月楮醒)
3@仿奶皮仿伉戊□伙 (扑旦氾丞仿奶皮仿伉卞殖引木月楮醒) 3@仿奶皮仿伉戊□伙 (扑旦氾丞仿奶皮仿伉卞殖引木月楮醒)
Index: man/man1/man.man1 --- man/man1/man.man1
===================================================================
--- man/man1/man.man1.orig
+++ man/man1/man.man1 +++ man/man1/man.man1
@@ -110,6 +110,7 @@ numbers of the manual followed by the ty @@ -110,6 +110,7 @@ numbers of the manual followed by the ty
.TS .TS
@ -562,15 +542,7 @@ Index: man/man1/man.man1
1@Executable programs or shell commands 1@Executable programs or shell commands
2@System calls (functions provided by the kernel) 2@System calls (functions provided by the kernel)
3@Library calls (functions within program libraries) 3@Library calls (functions within program libraries)
Index: po/stamp-cat-id --- src/Makefile.in
===================================================================
--- /dev/null
+++ po/stamp-cat-id
@@ -0,0 +1 @@
+timestamp
Index: src/Makefile.in
===================================================================
--- src/Makefile.in.orig
+++ src/Makefile.in +++ src/Makefile.in
@@ -40,7 +40,7 @@ include ../include/Defines @@ -40,7 +40,7 @@ include ../include/Defines
@ -603,9 +575,7 @@ Index: src/Makefile.in
$(INSTALL_PROGRAM) manpath $(DESTDIR)$(bindir)/$(manpath) $(INSTALL_PROGRAM) manpath $(DESTDIR)$(bindir)/$(manpath)
$(INSTALL_PROGRAM) catman $(DESTDIR)$(bindir)/$(catman) $(INSTALL_PROGRAM) catman $(DESTDIR)$(bindir)/$(catman)
$(INSTALL_PROGRAM) whatis $(DESTDIR)$(bindir)/$(whatis) $(INSTALL_PROGRAM) whatis $(DESTDIR)$(bindir)/$(whatis)
Index: src/check_mandirs.c --- src/check_mandirs.c
===================================================================
--- src/check_mandirs.c.orig
+++ src/check_mandirs.c +++ src/check_mandirs.c
@@ -161,7 +161,7 @@ void test_manfile (const char *file, con @@ -161,7 +161,7 @@ void test_manfile (const char *file, con
} }
@ -741,9 +711,7 @@ Index: src/check_mandirs.c
content = MYDBM_FETCH (dbf, key); content = MYDBM_FETCH (dbf, key);
if (!content.dptr) if (!content.dptr)
return count; return count;
Index: src/compression.c --- src/compression.c
===================================================================
--- src/compression.c.orig
+++ src/compression.c +++ src/compression.c
@@ -60,26 +60,30 @@ extern int errno; @@ -60,26 +60,30 @@ extern int errno;
#ifdef COMP_SRC /* must come after manconfig.h */ #ifdef COMP_SRC /* must come after manconfig.h */
@ -818,9 +786,7 @@ Index: src/compression.c
+} +}
+ +
#endif /* COMP_SRC */ #endif /* COMP_SRC */
Index: src/encodings.c --- src/encodings.c
===================================================================
--- src/encodings.c.orig
+++ src/encodings.c +++ src/encodings.c
@@ -112,7 +112,7 @@ static struct directory_entry directory_ @@ -112,7 +112,7 @@ static struct directory_entry directory_
{ "ru", "KOI8-R", "KOI8-R" }, /* Russian */ { "ru", "KOI8-R", "KOI8-R" }, /* Russian */
@ -831,9 +797,7 @@ Index: src/encodings.c
{ NULL, NULL, "NULL" } { NULL, NULL, "NULL" }
}; };
Index: src/fake_security.c --- src/fake_security.c
===================================================================
--- src/fake_security.c.orig
+++ src/fake_security.c +++ src/fake_security.c
@@ -45,6 +45,7 @@ extern int errno; @@ -45,6 +45,7 @@ extern int errno;
#include "security.h" #include "security.h"
@ -843,9 +807,7 @@ Index: src/fake_security.c
#ifdef SECURE_MAN_UID #ifdef SECURE_MAN_UID
static struct passwd *man_owner; static struct passwd *man_owner;
Index: src/lexgrog.l --- src/lexgrog.l
===================================================================
--- src/lexgrog.l.orig
+++ src/lexgrog.l +++ src/lexgrog.l
@@ -45,6 +45,10 @@ extern int errno; @@ -45,6 +45,10 @@ extern int errno;
# include <unistd.h> # include <unistd.h>
@ -1240,9 +1202,7 @@ Index: src/lexgrog.l
if (some_failed) if (some_failed)
return FATAL; return FATAL;
else else
Index: src/man.c --- src/man.c
===================================================================
--- src/man.c.orig
+++ src/man.c +++ src/man.c
@@ -98,11 +98,16 @@ static char *cwd; @@ -98,11 +98,16 @@ static char *cwd;
#include <utime.h> #include <utime.h>
@ -1715,9 +1675,7 @@ Index: src/man.c
dbdelete_wrapper (candp->req_name, candp->source); dbdelete_wrapper (candp->req_name, candp->source);
} }
#endif /* MAN_DB_UPDATES */ #endif /* MAN_DB_UPDATES */
Index: src/man_db.conf.in --- src/man_db.conf.in
===================================================================
--- src/man_db.conf.in.orig
+++ src/man_db.conf.in +++ src/man_db.conf.in
@@ -17,10 +17,15 @@ @@ -17,10 +17,15 @@
# #
@ -1964,9 +1922,7 @@ Index: src/man_db.conf.in
# their main section (e.g. "1 1mh 8 ..."). # their main section (e.g. "1 1mh 8 ...").
-SECTION 1 n l 8 3 2 3posix 3pm 3perl 5 4 9 6 7 -SECTION 1 n l 8 3 2 3posix 3pm 3perl 5 4 9 6 7
+SECTION 0 1 n l 8 3 2 5 4 9 6 7 1x 3x 4x 5x 6x 8x 1bind 3bind 5bind 7bind 8bind 1cn 8cn 1m 1mh 5mh 8mh 1netpbm 3netpbm 5netpbm 0p 1p 3p 1pgsql 3C++ 3blt 3blt 3curses 3ncurses 3form 3menu 3db 3gdbm 3f 3gk 3mm 3paper 3perl 3pgsql 3pm 3posix 3pq 3qt 3pub 3readline 1ssl 3ssl 5ssl 7ssl 3t 3tk 3tcl 3tclx 3tix 5mm 5pgsql 7l 7nr 8C++ 8c +SECTION 0 1 n l 8 3 2 5 4 9 6 7 1x 3x 4x 5x 6x 8x 1bind 3bind 5bind 7bind 8bind 1cn 8cn 1m 1mh 5mh 8mh 1netpbm 3netpbm 5netpbm 0p 1p 3p 1pgsql 3C++ 3blt 3blt 3curses 3ncurses 3form 3menu 3db 3gdbm 3f 3gk 3mm 3paper 3perl 3pgsql 3pm 3posix 3pq 3qt 3pub 3readline 1ssl 3ssl 5ssl 7ssl 3t 3tk 3tcl 3tclx 3tix 5mm 5pgsql 7l 7nr 8C++ 8c
Index: src/mandb.c --- src/mandb.c
===================================================================
--- src/mandb.c.orig
+++ src/mandb.c +++ src/mandb.c
@@ -138,6 +138,8 @@ static char *xtmpfile; @@ -138,6 +138,8 @@ static char *xtmpfile;
#ifdef SECURE_MAN_UID #ifdef SECURE_MAN_UID
@ -2003,9 +1959,7 @@ Index: src/mandb.c
do_chown (man_owner->pw_uid); do_chown (man_owner->pw_uid);
#endif /* SECURE_MAN_UID */ #endif /* SECURE_MAN_UID */
} else } else
Index: src/manp.c --- src/manp.c
===================================================================
--- src/manp.c.orig
+++ src/manp.c +++ src/manp.c
@@ -54,6 +54,7 @@ @@ -54,6 +54,7 @@
# include <strings.h> # include <strings.h>
@ -2135,9 +2089,7 @@ Index: src/manp.c
} }
} }
Index: src/security.c --- src/security.c
===================================================================
--- src/security.c.orig
+++ src/security.c +++ src/security.c
@@ -87,10 +87,13 @@ extern int errno; @@ -87,10 +87,13 @@ extern int errno;
# ifdef POSIX_SAVED_IDS # ifdef POSIX_SAVED_IDS
@ -2222,9 +2174,7 @@ Index: src/security.c
#endif /* SECURE_MAN_UID */ #endif /* SECURE_MAN_UID */
} }
Index: src/straycats.c --- src/straycats.c
===================================================================
--- src/straycats.c.orig
+++ src/straycats.c +++ src/straycats.c
@@ -48,6 +48,7 @@ extern char *strrchr(); @@ -48,6 +48,7 @@ extern char *strrchr();
@ -2294,9 +2244,7 @@ Index: src/straycats.c
if (lg.whatis) if (lg.whatis)
free (lg.whatis); free (lg.whatis);
Index: src/ult_src.c --- src/ult_src.c
===================================================================
--- src/ult_src.c.orig
+++ src/ult_src.c +++ src/ult_src.c
@@ -37,6 +37,9 @@ @@ -37,6 +37,9 @@
#include <sys/stat.h> #include <sys/stat.h>
@ -2434,9 +2382,7 @@ Index: src/ult_src.c
} }
/* We have the ultimate source */ /* We have the ultimate source */
Index: src/ult_src.h --- src/ult_src.h
===================================================================
--- src/ult_src.h.orig
+++ src/ult_src.h +++ src/ult_src.h
@@ -21,9 +21,10 @@ @@ -21,9 +21,10 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@ -2452,9 +2398,7 @@ Index: src/ult_src.h
extern const char *ult_src (const char *name, const char *path, extern const char *ult_src (const char *name, const char *path,
struct stat *buf, int flags); struct stat *buf, int flags);
Index: src/util.c --- src/util.c
===================================================================
--- src/util.c.orig
+++ src/util.c +++ src/util.c
@@ -58,6 +58,9 @@ extern char *strcpy(); @@ -58,6 +58,9 @@ extern char *strcpy();
# include <unistd.h> # include <unistd.h>
@ -2466,9 +2410,7 @@ Index: src/util.c
#include "manconfig.h" #include "manconfig.h"
#include "libdb/mydbm.h" /* for full definition of MAN_DB */ #include "libdb/mydbm.h" /* for full definition of MAN_DB */
#include "lib/pipeline.h" #include "lib/pipeline.h"
Index: src/wrapper.c --- src/wrapper.c
===================================================================
--- src/wrapper.c.orig
+++ src/wrapper.c +++ src/wrapper.c
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#include <stdio.h> #include <stdio.h>
@ -2586,9 +2528,7 @@ Index: src/wrapper.c
+ perror ("execve"); + perror ("execve");
return -errno; return -errno;
} }
Index: zsoelim/zsoelim.l --- zsoelim/zsoelim.l
===================================================================
--- zsoelim/zsoelim.l.orig
+++ zsoelim/zsoelim.l +++ zsoelim/zsoelim.l
@@ -31,8 +31,20 @@ @@ -31,8 +31,20 @@
* - added changes that were done to .c instead of -l source * - added changes that were done to .c instead of -l source

5
man.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Feb 9 13:16:35 CET 2007 - werner@suse.de
- Make it build without root privileges, loosing time for texlive
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 29 16:10:01 CET 2007 - sbrabec@suse.cz Mon Jan 29 16:10:01 CET 2007 - sbrabec@suse.cz

8
man.spec
View File

@ -8,11 +8,12 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: man Name: man
BuildRequires: flex groff libzio util-linux BuildRequires: flex groff libzio util-linux
Version: 2.4.3 Version: 2.4.3
Release: 33 Release: 35
Summary: A Program for Displaying man Pages Summary: A Program for Displaying man Pages
License: GNU General Public License (GPL) License: GNU General Public License (GPL)
Group: System/Base Group: System/Base
@ -75,7 +76,7 @@ set +o posix
install -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}/var/adm/fillup-templates install -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}/var/adm/fillup-templates
install -m 0744 %{SOURCE2} ${RPM_BUILD_ROOT}/etc/cron.daily/suse-do_mandb install -m 0744 %{SOURCE2} ${RPM_BUILD_ROOT}/etc/cron.daily/suse-do_mandb
install -m 0744 %{SOURCE3} ${RPM_BUILD_ROOT}/etc/cron.daily/suse-clean_catman install -m 0744 %{SOURCE3} ${RPM_BUILD_ROOT}/etc/cron.daily/suse-clean_catman
Check /usr/sbin/Check
#touch /tmp/estamp; sleep 3; sync #touch /tmp/estamp; sleep 3; sync
#( #(
# find / -xdev \( -newer /tmp/bstamp -a \( -not -newer /tmp/estamp \) \) -a \( \ # find / -xdev \( -newer /tmp/bstamp -a \( -not -newer /tmp/estamp \) \) -a \( \
@ -91,6 +92,7 @@ test -d var/catman/ && rm -rf var/catman/ || true
%{fillup_only -an cron} %{fillup_only -an cron}
%files %files
%defattr(-,root,root)
%config /etc/manpath.config %config /etc/manpath.config
%attr(0744,root,root) /etc/cron.daily/suse-clean_catman %attr(0744,root,root) /etc/cron.daily/suse-clean_catman
%attr(0744,root,root) /etc/cron.daily/suse-do_mandb %attr(0744,root,root) /etc/cron.daily/suse-do_mandb
@ -145,6 +147,8 @@ test -d var/catman/ && rm -rf var/catman/ || true
/var/adm/fillup-templates/sysconfig.cron-man /var/adm/fillup-templates/sysconfig.cron-man
%changelog -n man %changelog -n man
* Fri Feb 09 2007 - werner@suse.de
- Make it build without root privileges, loosing time for texlive
* Mon Jan 29 2007 - sbrabec@suse.cz * Mon Jan 29 2007 - sbrabec@suse.cz
- Removed references to /opt/gnome. - Removed references to /opt/gnome.
* Mon Sep 04 2006 - rguenther@suse.de * Mon Sep 04 2006 - rguenther@suse.de