Clean up the rpm build stuff a bit