Refs #3338 -- Partially fix rpm packaging problems. There is still one issue remaining with how we construct the version numbers, but this change is useful nonetheless. Patch from Dirk Datzert.
