r4528: merge Fedora spec file fixes