* Add simple version to package information by default
 * Corrections to build number calculation
 * Improvements to spec that were machine path specific