Sync with builds in Fedora.  Spec bumped to 2.2.0-7