- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-1" to attempt to

workaround bug( #173384).

xorg-x11-proto-devel.spec

@@ -6,7 +6,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 0.99.2
-Release: 2
+Release: 3
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -47,9 +47,19 @@ Source30: %{sourceurl}/xproxymanagementprotocol-1.0.1.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xorg-x11-util-macros
+# FIXME: This buildreq on xorg-x11-filesystem isn't really necessary, and
+# can be removed in the future.  The main purpose of it being here right
+# now, is to force buildmachines to get updated to solve the dir/symlink
+# issue.
+BuildRequires: xorg-x11-filesystem >= 0.99.2-1
 
 Obsoletes: XFree86-devel, xorg-x11-devel
 
+# 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
+
 %description
 X.Org X11 Protocol headers
 
@@ -260,6 +270,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Mon Nov 21 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-3
+- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-1" to attempt to
+  workaround bug( #173384).
+
 * Thu Nov 17 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
 - Change Conflicts to "Obsoletes: XFree86-devel, xorg-x11-devel"