packages: man-db/man-db.spec, man-db/so-include.patch (NEW)=?UTF-8?Q?=20?=- rel 6 - appar...

[baggins]

Author: baggins                      Date: Tue Mar 20 17:03:31 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6
- apparently man-db requires .so includes in the form ".so manX/cmd.X"
  hack it to understand directives without a directory

---- Files affected:
packages/man-db:
   man-db.spec (1.8 -> 1.9) , so-include.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/man-db/man-db.spec
diff -u packages/man-db/man-db.spec:1.8 packages/man-db/man-db.spec:1.9
--- packages/man-db/man-db.spec:1.8	Mon Mar 12 20:58:43 2012
+++ packages/man-db/man-db.spec	Tue Mar 20 18:03:26 2012
@@ -2,7 +2,7 @@
 Summary:	Tools for searching and reading man pages
 Name:		man-db
 Version:	2.6.1
-Release:	5
+Release:	6
 # project man-db  GPLv2+
 # Gnulib part     GPLv3+
 License:	GPL v2+ and GPL v3+
@@ -12,6 +12,7 @@
 # Source0-md5:	79658e8695c7b9b3be1ee340d78a4692
 Source1:	%{name}.daily
 Source2:	%{name}.sysconfig
+Patch0:		so-include.patch
 # Resolves: #655385 - use old format of nroff output
 Patch1:		sgr.patch
 BuildRequires:	gdbm-devel
@@ -45,6 +46,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 
 %build
@@ -134,6 +136,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2012/03/20 17:03:26  baggins
+- rel 6
+- apparently man-db requires .so includes in the form ".so manX/cmd.X"
+  hack it to understand directives without a directory
+
 Revision 1.8  2012/03/12 19:58:43  baggins
 - rel 5
 - O man-config

================================================================
Index: packages/man-db/so-include.patch
diff -u /dev/null packages/man-db/so-include.patch:1.1
--- /dev/null	Tue Mar 20 18:03:31 2012
+++ packages/man-db/so-include.patch	Tue Mar 20 18:03:26 2012
@@ -0,0 +1,17 @@
+--- man-db-2.6.1/src/ult_src.c.orig	2012-02-05 14:21:24.000000000 +0100
++++ man-db-2.6.1/src/ult_src.c	2012-03-20 18:00:09.000000000 +0100
+@@ -343,6 +343,14 @@
+ 				free (base);
+ 				base = appendstr (NULL, path, "/", include,
+ 						  NULL);
++				if (strchr(include, '/') == NULL) {
++					char *sec = strrchr(include, '.');
++					debug ("ult_src: wrong .so include %s\n", buffer);
++					if (sec != NULL && *sec++ != NULL) {
++						free (base);
++						base = appendstr (NULL, path, "/man", sec, "/", include, NULL);
++					}
++				}
+ 				free (include);
+ 
+ 				debug ("ult_src: points to %s\n", base);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org//packages/man-db/man-db.spec?r1=1.8&r2=1.9&f=u