Fix version to be acceptable by rpmbuild.

rpmbuild does not accept version numbers with a dash
in them.

Redo the versioning to be 3.1.0 instead of 3-1.0.