put the x11 devel package back in buildrequires and a couple other spec fixes