Fix rpmbuild issues for rhel