Added more rpm macro substitutions.