Merge "Updates RPM specs and building"