[tomcat6] cleaning up spec and correcting nvr. resolving rhbz 640134