more macroizing of spec file