remove subdirs spack/opt/spack from upstream definitions, as it collides with...

remove subdirs spack/opt/spack from upstream definitions, as it collides with the naming scheme at DKRZ