More robust search for -comps.xml

This makes it easier when switching to *-c6-x86_64-comps.xml or
c7-minimal-x86_64-comps.xml