Spec and build fixes. ---------------------------------------------------------------------- SVN revision: 32416