rpms/man/devel man.spec,1.80,1.81

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/man/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15853/devel

Modified Files:
	man.spec 
Log Message:
* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-20
- Don't remove cache and whatis database on updates
- Ghost whatis database



Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- man.spec	21 Apr 2009 05:01:00 -0000	1.80
+++ man.spec	21 Apr 2009 12:46:10 -0000	1.81
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 19%{?dist}
+Release: 20%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -192,6 +192,7 @@
 install -m755 %{SOURCE4} $RPM_BUILD_ROOT/%{_libexecdir}/man-cmp.sh
 
 mkdir -p $RPM_BUILD_ROOT/%{cache}
+touch $RPM_BUILD_ROOT/%{cache}/whatis
 
 mkdir -p $RPM_BUILD_ROOT/%{cache}/local
 mkdir -p $RPM_BUILD_ROOT/%{cache}/X11R6
@@ -227,17 +228,10 @@
 rm -rf $RPM_BUILD_ROOT%{_prefix}/etc
 
 %preun
+[ $1 = 0 ] || exit 0
 rm -f %{cache}/cat[123456789n]/* 2>/dev/null || :
 rm -f %{cache}/local/cat[123456789n]/* 2>/dev/null || :
 rm -f %{cache}/X11R6/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/whatis 2>/dev/null || :
-
-%triggerpostun -- man <= 1.5i2-0
-rm -f %{cache}/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/local/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/X11R6/cat[123456789n]/* 2>/dev/null || :
-rm -f %{cache}/whatis 2>/dev/null || :
-exit 0
 
 
 %clean
@@ -261,6 +255,7 @@
 %{_mandir}/man5/man.config.5*
 %{_mandir}/man1/*
 %{_mandir}/man8/makewhatis.8*
+%ghost %{cache}/whatis
 %attr(0755,root,root)   %dir %{cache}
 %attr(0755,root,man)    %dir %{cache}/cat[123456789n]
 %attr(0755,root,man)    %dir %{cache}/local
@@ -270,6 +265,10 @@
 
 
 %changelog
+* Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-20
+- Don't remove cache and whatis database on updates
+- Ghost whatis database
+
 * Tue Apr 21 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.6f-19
 - The daily cron job is not a configuration file