rpms/man/F-11 makewhatis.crondaily,1.4,1.5 man.spec,1.79,1.80

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/man/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26273/F-11

Modified Files:
	makewhatis.crondaily man.spec 
Log Message:
* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-19
- The daily cron job is not a configuration file



Index: makewhatis.crondaily
===================================================================
RCS file: /cvs/pkgs/rpms/man/F-11/makewhatis.crondaily,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makewhatis.crondaily	27 Oct 2006 08:09:52 -0000	1.4
+++ makewhatis.crondaily	21 Apr 2009 05:00:59 -0000	1.5
@@ -16,5 +16,13 @@
 
 trap "{ rm -f $LOCKFILE ; exit 255; }" EXIT
 touch $LOCKFILE
-makewhatis -u -w
+# Rebuild the database if makewhatis was since last full run,
+# otherwise just update with new pages
+if [ ! -f /var/cache/man/whatis ] ||
+   find /usr/sbin/makewhatis -newer /var/cache/man/whatis |grep -q .
+then
+	makewhatis -w
+else
+	makewhatis -U -w
+fi
 exit 0


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/F-11/man.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- man.spec	20 Apr 2009 19:47:39 -0000	1.79
+++ man.spec	21 Apr 2009 05:00:59 -0000	1.80
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 18%{?dist}
+Release: 19%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -245,12 +245,12 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%config(noreplace) /etc/cron.daily/makewhatis.cron
-%config(noreplace) /etc/man.config
+%{_sysconfdir}/cron.daily/makewhatis.cron
+%config(noreplace) %{_sysconfdir}/man.config
 %if %{usecache}
-%attr(2755,root,man)    /usr/bin/man
+%attr(2755,root,man)    %{_bindir}/man
 %else
-%attr(0755,root,root)   /usr/bin/man
+%attr(0755,root,root)   %{_bindir}/man
 %endif
 %{_bindir}/manpath
 %{_bindir}/apropos
@@ -270,6 +270,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-19
+- The daily cron job is not a configuration file
+
 * Sun Apr 19 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-18
 - Get rid of slow weekly updates
 - Make daily updates reliable