More fixes to the RPM building build script.