Tidy up rpm packaging