SPEC file cleanups to match current codebase