Each of the modular X tool packages should have: Obsoletes: xorg-x11-tools like it's done for xorg-x11-libs in modular X library packages
Over the last few hours, I've went through most of the new modular packages to rebuild them to pick up the libXaw fix, and at the same time I have reviewed each binary in the new package, and reviewed where it was in xorg and XFree86 packaging, and added the appropriate Obsoletes lines. That should be done now for xorg-x11, xorg-x11-devel, xorg-x11-libs, xorg-x11-tools for all packages now I believe. It's possible that a few might have slipped past me, but I think I got most if not all of them now. Once the next modular packages are pushed to my p.r.c dir (it's empty now, so just watch the dir), if you find any more missing, please file a new bug report with details, and I'll try to fix them up ASAP. Thanks.