Updated build-rpm to #2812