diff --git a/xorg-x11-fonts.spec b/xorg-x11-fonts.spec
index 22d9c51..992674e 100644
--- a/xorg-x11-fonts.spec
+++ b/xorg-x11-fonts.spec
@@ -30,7 +30,7 @@
 Summary:	X.Org X11 fonts
 Name:		xorg-x11-fonts
 Version:	7.1
-Release:	1
+Release:	2
 License:	Various licenses
 Group:		User Interface/X
 URL:		http://www.x.org
@@ -557,7 +557,7 @@ done
 %postun base
 {
   # Rebuild fonts.dir when uninstalling package. (exclude the local, CID dirs)
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/misc ]; then
     mkfontdir %{_x11fontdir}/misc
     # Only run fc-cache in the Type1 dir, gzipped pcf's take forever
     fc-cache %{_x11fontdir}/misc
@@ -582,7 +582,7 @@ done
 %postun misc
 {
   # Rebuild fonts.dir when uninstalling package. (exclude the local, CID dirs)
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/misc ]; then
     mkfontdir %{_x11fontdir}/misc
     # Only run fc-cache in the Type1 dir, gzipped pcf's take forever
     fc-cache %{_x11fontdir}/misc
@@ -603,7 +603,7 @@ done
 %postun Type1
 {
   FONTDIR=%{_type1_fontdir}/Type1
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d $FONTDIR ]; then
     mkfontscale $FONTDIR
     mkfontdir $FONTDIR
     fc-cache $FONTDIR
@@ -624,7 +624,7 @@ done
 %postun truetype
 {
   FONTDIR=%{_ttf_fontdir}/TTF
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d $FONTDIR ]; then
     ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
     mkfontdir $FONTDIR
     fc-cache $FONTDIR
@@ -645,7 +645,7 @@ done
 %postun syriac
 {
   FONTDIR=%{_otf_fontdir}/OTF
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d $FONTDIR ]; then
     mkfontscale $FONTDIR
     mkfontdir $FONTDIR
     fc-cache $FONTDIR
@@ -673,13 +673,13 @@ done
 %postun ethiopic
 {
   FONTDIR=%{_ttf_fontdir}/TTF
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d $FONTDIR ]; then
     ttmkfdir -d $FONTDIR -o $FONTDIR/fonts.scale
     mkfontdir $FONTDIR
     fc-cache $FONTDIR
   fi
   FONTDIR=%{_otf_fontdir}/OTF
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d $FONTDIR ]; then
     mkfontscale $FONTDIR
     mkfontdir $FONTDIR
     fc-cache $FONTDIR
@@ -781,7 +781,7 @@ done
 
 %postun 75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -789,7 +789,7 @@ done
 
 %postun 100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -797,7 +797,7 @@ done
 
 %postun ISO8859-1-75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -805,7 +805,7 @@ done
 
 %postun ISO8859-1-100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -813,7 +813,7 @@ done
 
 %postun ISO8859-2-75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -821,7 +821,7 @@ done
 
 %postun ISO8859-2-100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi  ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -829,7 +829,7 @@ done
 
 %postun ISO8859-9-75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -837,7 +837,7 @@ done
 
 %postun ISO8859-9-100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi  ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -845,7 +845,7 @@ done
 
 %postun ISO8859-14-75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -853,7 +853,7 @@ done
 
 %postun ISO8859-14-100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi  ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -861,7 +861,7 @@ done
 
 %postun ISO8859-15-75dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/75dpi ]; then
     mkfontdir %{_x11fontdir}/75dpi
   fi
 }
@@ -869,7 +869,7 @@ done
 
 %postun ISO8859-15-100dpi
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/100dpi  ]; then
     mkfontdir %{_x11fontdir}/100dpi
   fi
 }
@@ -877,7 +877,7 @@ done
 
 %postun cyrillic
 {
-  if [ "$1" = "0" ]; then
+  if [ "$1" = "0" -a -d %{_x11fontdir}/cyrillic ]; then
     mkfontdir %{_x11fontdir}/cyrillic
   fi
 }
@@ -1534,6 +1534,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
 
 %changelog
+* Thu Aug 31 2006 Kristian Høgsberg <krh@redhat.com> 7.1-2
+- Fix postun scripts to only run if the directory is still there (#197208).
+
 * Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 7.1-1
 - Added "BuildRequires: autoconf" temporary dependency.
 - Use Fedora Extras style BuildRoot specification.