clean up spec file: remove comment out macros and sub packages