remove unused macros
update urls
break BuildRequires out to individual lines
add vendor
better use of macros
add el7 conditionals and re-number sources