Fix not moving rpm x86_64 and noarch together