Merge spec file changes from Fedora repository.

Merged RPM spec file changes from the Fedora repository.