A bunch of spec file cleanup