Remove EPEL5-specific provisions, use macros and fix spelling/typos