sync macros with this spec and ones in rpm-buildc
update macros to match exactly here and outside (need to hack with versioned subdirs)