Build fix for Fedora.

Fixes #6250
Fix revision in version string.

Fixes #6231
Test.
Test 2.