improved cleaning in make_rpm