added lines to delete existing output rpm's before building
reordered macros to group the empty ones