Merge in spec file updates.