yumpkg: handle i686 pkgs on x86_64 (#3638)

Also modified the remove function to properly deal with i686 pkgs on
x86_64 boxes.