Merge pull request #2044 from RincewindsHat/fix/fedora-rpm-build