Merge python-rpm.spec into rpm.spec and cleaning up the spec file.