rpms/man/devel makewhatis.crondaily, 1.3, 1.4 makewhatis.cronweekly, 1.3, 1.4 man-1.6d-updates.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: varekova

Update of /cvs/dist/rpms/man/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9174

Modified Files:
	makewhatis.crondaily makewhatis.cronweekly 
	man-1.6d-updates.patch 
Log Message:
- change MAKEWHATISDBUPDATES option



Index: makewhatis.crondaily
===================================================================
RCS file: /cvs/dist/rpms/man/devel/makewhatis.crondaily,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- makewhatis.crondaily	27 Oct 2006 06:09:18 -0000	1.3
+++ makewhatis.crondaily	27 Oct 2006 08:09:52 -0000	1.4
@@ -8,10 +8,10 @@
 # happen is that they will temporarily corrupt the database...
 [ -f $LOCKFILE ] && exit 0
 
-# if MAKEWHATISDBUPDATES variable is set to "n", then the update
-# will not pass
+# if MAKEWHATISDBUPDATES variable is set to "n" or "N", then the 
+# update will not passed
 
-MDU=`grep "MAKEWHATISDBUPDATES" man.conf.in | grep -v -- "#" | sed -e "s/MAKEWHATISDBUPDATES=\(.\)/\1/"`;
+MDU=`sed -n -e 's/^[[:blank:]]*MAKEWHATISDBUPDATES[[:blank:]]*\(.\)[[:blank:]]*$/\1/p' < /etc/man.config`
 ([ "$MDU" == "n" ] || [ "$MDU" == "N" ]) && exit 0
 
 trap "{ rm -f $LOCKFILE ; exit 255; }" EXIT


Index: makewhatis.cronweekly
===================================================================
RCS file: /cvs/dist/rpms/man/devel/makewhatis.cronweekly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- makewhatis.cronweekly	27 Oct 2006 06:09:18 -0000	1.3
+++ makewhatis.cronweekly	27 Oct 2006 08:09:52 -0000	1.4
@@ -8,10 +8,10 @@
 # happen is that they will temporarily corrupt the database...
 [ -f $LOCKFILE ] && exit 0
 
-# if MAKEWHATISDBUPDATES variable is set to "n", then the update
-# will not pass
+# if MAKEWHATISDBUPDATES variable is set to "n" or "N", then the 
+# update will not pass
 
-MDU=`grep "MAKEWHATISDBUPDATES" man.conf.in | grep -v -- "#" | sed -e "s/MAKEWHATISDBUPDATES=\(.\)/\1/"`;
+MDU=`sed -n -e 's/^[[:blank:]]*MAKEWHATISDBUPDATES[[:blank:]]*\(.\)[[:blank:]]*$/\1/p' < /etc/man.config`
 ([ "$MDU" == "n" ] || [ "$MDU" == "N" ]) && exit 0
 
 trap "{ rm -f $LOCKFILE; exit 255; }" EXIT

man-1.6d-updates.patch:
 man.conf.in |   10 ++++++++++
 paths.h.in  |    3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

Index: man-1.6d-updates.patch
===================================================================
RCS file: /cvs/dist/rpms/man/devel/man-1.6d-updates.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- man-1.6d-updates.patch	27 Oct 2006 06:09:18 -0000	1.1
+++ man-1.6d-updates.patch	27 Oct 2006 08:09:52 -0000	1.2
@@ -1,5 +1,15 @@
---- man-1.6d/src/man.conf.in.pom	2006-10-25 15:19:13.000000000 +0200
-+++ man-1.6d/src/man.conf.in	2006-10-26 14:13:05.000000000 +0200
+--- man-1.6d/src/paths.h.in.upd	2006-10-27 09:39:06.000000000 +0200
++++ man-1.6d/src/paths.h.in	2006-10-27 09:40:26.000000000 +0200
+@@ -33,5 +33,6 @@
+     { "COMPRESS_EXT", "@compress_ext@" }, /* not a path, just a string variable */
+     { "DECOMPRESS",	"@decompress@" },
+     { "MANSECT",  "@sections@"},          /* idem */
+-    { "MANDEFOPTIONS", ""}                /* idem */
++    { "MANDEFOPTIONS", ""},               /* idem */
++    { "MAKEWHATISDBUPDATES", ""}	  /* option is used in makewhatis.cron{weekly|daily} scripts */
+ };
+--- man-1.6d/src/man.conf.in.upd	2006-10-27 09:39:06.000000000 +0200
++++ man-1.6d/src/man.conf.in	2006-10-27 09:39:06.000000000 +0200
 @@ -135,3 +135,13 @@
  .Z		@zcat@
  .F		@fcat@
@@ -13,4 +23,4 @@
 +# will not update makewhatis database.
 +# Otherwise the database will be updated.
 +# 
-+#MAKEWHATISDBUPDATES=n
++#MAKEWHATISDBUPDATES	n