Fixes for RPM and --architecture

Currently, using `--architecture` and `-t rpm` results in an error from rpmbuild. These changes are necessary in order to create 32-bit RPMs on a 64-bit Centos.