Fix, that earlier corrected #221 needs to be moved to rpkg, not to duplicate code for fedpkg and rhpkg.
Related: https://pagure.io/fedpkg/issue/221
Commit 62bd5d9a fixes this issue
Metadata Update from @onosek: - Issue set to the milestone: 1.36