FC4 XKB config problem

I've encountered this problem after my upgrade from FC3 to FC4:

Gnome gives the following error box on login:

************BEGIN DIALOG BOX
Error activating XKB configuration.
It can happen under various circumstances:
- a bug in libxklavier library
- a bug in X server (xkbcomp, xmodmap utilities)
- X server with incompatible libxkbfile implementation

X server version data:
The X.Org Foundation
60802000

If you report this situation as a bug, please include:
- The result of <b>xprop -root | grep XKB</b>
- The result of <b>gconftool-2 -R /desktop/gnome/peripherals/keyboard/kbd</b>
************END DIALOG BOX

xprop produces:

_XKB_RULES_NAMES_BACKUP(STRING) = "xorg", "pc105", "us", "", ""
_XKB_RULES_NAMES(STRING) = "xorg", "pc105", "us", "", ""


gconftool-2 produces NO output.


yum update produces this:

**********************BEGIN YUM OUTPUT
Repository dries already added, not adding again
Setting up Update Process
Setting up repositories
dries                     100% |=========================| 1.1 kB    00:00
extras                    100% |=========================| 1.1 kB    00:00
updates-released          100% |=========================|  951 B    00:00
base                      100% |=========================| 1.1 kB    00:00
Reading repository metadata in from local files
Resolving Dependencies
--> Populating transaction set with selected packages. Please wait.
---> Package xorg-x11.i386 0:6.8.2-37 set to be updated
--> Running transaction check

Dependencies Resolved

=============================================================================
 Package                 Arch       Version          Repository        Size
=============================================================================
Updating:
 xorg-x11                i386       6.8.2-37         updates-released   14 M

Transaction Summary
=============================================================================
Install      0 Package(s)
Update       1 Package(s)
Remove       0 Package(s)
Total download size: 14 M
Is this ok [y/N]: y
Downloading Packages:
Running Transaction Test
Finished Transaction Test
Transaction Test Succeeded
Running Transaction
  Updating  : xorg-x11                     ######################### [1/2]
error: unpacking of archive failed on file /etc/X11/xkb: cpio: rename

Updated: xorg-x11.i386 0:6.8.2-37
Complete!
**********************************END YUM OUTPUT


A partial listing of /etc/X11 looks like this:

drwxr-xr-x   5 root root  4096 Jun  2 16:37 xinit
drwxr-xr-x  10 root root  4096 Apr  9 20:44 xkb

-rw-r--r--   1 root root   547 Apr 11 05:43 Xmodmap

drwxr-xr-x   2 root root   4096 Apr  9 20:43 compat
-r--r--r--   1 root root    689 Apr  9 20:43 compat.dir
lrwxrwxrwx   1 root root     20 Apr  9 20:44 compiled -> ../../../var/lib/xkb
drwxr-xr-x   5 root root   4096 Apr  9 20:43 geometry
-r--r--r--   1 root root   1965 Apr  9 20:43 geometry.dir
drwxr-xr-x   4 root root   4096 Apr  9 20:43 keycodes
-r--r--r--   1 root root   2250 Apr  9 20:43 keycodes.dir
drwxr-xr-x   5 root root   4096 Apr  9 20:43 keymap
-r--r--r--   1 root root   8576 Apr  9 20:43 keymap.dir
-r--r--r--   1 root root    983 Apr  9 20:43 README
-r--r--r--   1 root root   7448 Apr  9 20:43 README.config
-r--r--r--   1 root root  23337 Apr  9 20:43 README.enhancing
drwxr-xr-x   2 root root   4096 Apr  9 20:43 rules
drwxr-xr-x   2 root root   4096 Apr  9 20:43 semantics
drwxr-xr-x  12 root root   4096 Apr  9 20:43 symbols
-r--r--r--   1 root root  27040 Apr  9 20:43 symbols.dir
drwxr-xr-x   2 root root   4096 Apr  9 20:43 types
-r--r--r--   1 root root    463 Apr  9 20:43 types.dir
-rwxr-xr-x   1 root root 178867 Apr  9 20:43 xkbcomp