Sync with Fedora g2 packaging changes.