Sync with fedoraproject.
Build updates for upstream.