Makefile: Combine the build rules for x86_64 and noarch RPMs

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

Makefile: Combine the build rules for x86_64 and noarch RPMs