Enable building of rpms on RHEL 7

Some tweaks to enable building of RPMs on RHEL 7.