If a patch is obsolete, remove it and remove the references from the spec file.

Also why are you commenting out osp-toolkit? If its not needed explain the change in the changes file and remove it from the spec file.

Thanks.