Updates for building rpm.

A number of fixes I found while correcting the version on the library.