Cleanup package and move x11 support to their packages

[rpm] Cleanup package and move x11 support to their packages