Fix up rpm bootstrap