Second batch of fixes for non-existent packages
As per the previous batch, fix more references to packages that
don't exist. This should cover all the remaining 'not found on
any arch' cases. Again I tried to check the reason for all cases
and provide appropriate replacements where possible.
Signed-off-by: Adam Williamson <awilliam@redhat.com>