From 52527ab029292b9bc6b874fb56de29501b89a513 Mon Sep 17 00:00:00 2001
From: mharris <mharris@fedoraproject.org>
Date: Mon, 21 Nov 2005 20:17:29 +0000
Subject: [PATCH] - Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-1" to
 attempt to     workaround bug( #173384).

---
 xorg-x11-xbitmaps.spec | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/xorg-x11-xbitmaps.spec b/xorg-x11-xbitmaps.spec
index d35c0e7..3f20772 100644
--- a/xorg-x11-xbitmaps.spec
+++ b/xorg-x11-xbitmaps.spec
@@ -11,7 +11,7 @@
 Summary: X.Org X11 application bitmaps
 Name: xorg-x11-%{pkgname}
 Version: 0.99.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -19,8 +19,12 @@ Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/%{pkgname}-%{version
 #Source0: %{pkgname}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
-Provides: %{pkgname}
+# NOTE: This dependency on xorg-x11-filesystem is required to work around
+# a nasty upgrade problem when going from FC4->FC5 or monolithic to
+# modular X.Org.  Bug #173384.
+Requires(pre): xorg-x11-filesystem >= 0.99.2-1
 
+Provides: %{pkgname}
 Provides: %{pkgname}-devel
 
 %description
@@ -69,6 +73,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xbitmaps.pc
 
 %changelog
+* Mon Nov 21 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-3
+- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-1" to attempt to
+  workaround bug( #173384).
+
 * Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2
 - Clean up specfile.