Packaging: spec cleanup.