Also move the macros to the proper location (%rpmmacrodir) and copy over one fix from the macros that were in epel-rpm-macros.