Updated spec to deal with renaming of cp tomcat in f19

So in F19  -> Its candlepin-tomcat
F18, Rhel 6-> Its candlepin-tomcat6

Also updated comps files