Remove version suffix (_5_0, etc.) from openmpi flavor

This makes it easier in the spec files, e.g. in conditionals

mpcdf_common.py

@@ -810,9 +810,10 @@ Macros:
                     dependencies = ((project, compiler),)
                     if not parent:
                         dependencies = openmpi_flavor_dependencies(of, distribution) + dependencies
+                    flavor_kind = re.sub("(_[0-9]+)*$", "", of)
                     repo(mpi + "_" + compiler + "_" + of, dependencies, mpi=True,
                          mpi_repository=mpi, mpi_module=mpi_module(mpi),
-                         openmpi_flavor=of)
+                         openmpi_flavor=flavor_kind)
 
     for cuda in cudas:
         for compiler in filter(partial(valid_cuda, cuda), compilers):