Rawhide file-conflict gnupg <> gnupg2