rpms/man/devel man-1.6f-makewhatis_whis.patch, NONE, 1.1 man.spec, 1.76, 1.77

[Ivana Varekova]

Author: varekova

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

Modified Files:
	man.spec 
Added Files:
	man-1.6f-makewhatis_whis.patch 
Log Message:
- Resolves: #481650
  makewhat fails if /usr is read-only



man-1.6f-makewhatis_whis.patch:

--- NEW FILE man-1.6f-makewhatis_whis.patch ---
diff -up man-1.6f/src/makewhatis.sh.whispath man-1.6f/src/makewhatis.sh
--- man-1.6f/src/makewhatis.sh.whispath	2009-02-12 14:22:51.000000000 +0100
+++ man-1.6f/src/makewhatis.sh	2009-02-12 14:28:19.000000000 +0100
@@ -62,7 +62,8 @@ done
 DEFCATPATH=$dc
 
 # make a single big /var/cache/man/whatis file,
-DEFWHATIS=/var/cache/man/whatis
+DEFWHATISDIR=/var/cache/man
+DEFWHATIS=$DEFWHATISDIR/whatis
 
 AWK=@awk@
 
@@ -183,20 +184,20 @@ do
 	mandir1=$mandir
      fi
 
-     # if $mandir is on a readonly partition, and the whatis file
+     # if $DEFWHATISDIR is on a readonly partition, and the whatis file
      # is not a symlink, then let's skip trying to update it
-     if [ ! -L ${mandir1}/whatis ]
+     if [ ! -L $DEFWHATIS ]
      then
-	if [ -e ${mandir1}/whatis ] && [ ! -w ${mandir1}/whatis ]
+	if [ -e $DEFWHATIS ] && [ ! -w $DEFWHATIS ]
 	then
 	   if [ x$verbose != x ]; then
-	      echo skipping $mandir - whatis file is readonly > /dev/stderr
+	      echo skipping $DEFWHATISDIR - whatis file is readonly > /dev/stderr
 	   fi
 	   continue
-	elif [ ! -e ${mandir1}/whatis ] && [ ! -w ${mandir1} ]
+	elif [ ! -e $DEFWHATIS ] && [ ! -w $DEFWHATISDIR ]
 	then
 	   if [ x$verbose != x ]; then
-	      echo skipping $mandir - directory is readonly > /dev/stderr
+	      echo skipping $DEFWHATISDIR - directory is readonly > /dev/stderr
 	   fi
 	   continue
 	fi


Index: man.spec
===================================================================
RCS file: /cvs/pkgs/rpms/man/devel/man.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- man.spec	12 Feb 2009 12:46:46 -0000	1.76
+++ man.spec	12 Feb 2009 13:58:56 -0000	1.77
@@ -4,7 +4,7 @@
 Summary: A set of documentation tools: man, apropos and whatis
 Name: man
 Version: 1.6f
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 License: GPLv2
 Group: System Environment/Base
@@ -36,6 +36,7 @@
 Patch32: man-1.6f-dashes2.patch
 Patch33: man-1.6f-star.patch
 Patch34: man-1.6f-lang_C.patch
+Patch35: man-1.6f-makewhatis_whis.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: coreutils
@@ -77,6 +78,7 @@
 %patch32 -p1 -b .dash2
 %patch33 -p1 -b .star
 %patch34 -p1 -b .lang
+%patch35 -p1 -b .whis
 
 cp -f %{SOURCE3} msgs   # replace bad ru trans
 cp -f %{SOURCE5} ./
@@ -267,6 +269,10 @@
 
 
 %changelog
+* Thu Feb 12 2009 Ivana Varekova <varekova at redhat.com> - 1.6f-16
+- Resolves: #481650
+  makewhat fails if /usr is read-only
+
 * Thu Feb 12 2009 Ivana Varekova <varekova at redhat.com> - 1.6f-15
 - Resolves: #485014
   Do not use .mo suffix for gencat message catalogs