Move logic in rpm specific places