mappkgname: Drop architecture annotations when mapping package names

Signed-off-by: Euan Harris <euan.harris@citrix.com>
Merge pull request #256 from euanh/build-improvements

mappkgname: Drop architecture annotations when mapping package names