Better multiarch rpm generation support