[rfpkg/el8] (6 commits) ...Fix for rpkg-1.65 change