mappkgname: Drop architecture annotations when mapping package names

Signed-off-by: Euan Harris <euan.harris@citrix.com>