Modular X server build issues

[<jfrieben freesurf fr>]

I have rebuilt Mike Harris' experimental modular xorg-x11 RPMs on a
base FC4 system. The following issues surfaced during the build (not
restricted to FC4, they apply to "rawhide" as well):

1. Conflicting files "/usr/include/GL/glx.h" for "mesa-GL-devel"
   and "xorg-x11-proto-devel".

2. Conflicting files "/usr/include/GL/glu.h" for "mesa-GLU-devel" and
   "xorg-x11-proto-devel".

2. Wrong requirement "xorg-x11-server" when the right package name
   was "xorg-x11-server-Xorg", applies to "xorg-x11-server-Xvfb" and
   "xorg-x11-server-Xnest" spec files

3. drv packages do not build because 'pkg-config xorg-x11-server
   --variable=driverdir' and 'pkg-config xorg-x11-server
   --variable=inputdir' are nil whereas 'pkg-config xorg-x11-server
   --variable=moduledir' yields "/usr/lib/xorg/modules". "moduledir"
   and "inputdir" are apparently undefined. A workaround is to set
   "driverdir" and "inputdir" in the spec file to "%(moduledir)/drivers"
   and "%(moduledir)/input" respectively.

4. xorg-x11-drv-mouse: "/usr/shar/man/man4/mouse.4.gz" conflicts with
   file from package "man-pages".