Makefile: Combine the build rules for x86_64 and noarch RPMs

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