Instead of all three variations, we could just have the OSI one, which is basically the zlib license template (no specific copyright) and then the specific libpng license, since it does have some other text differences. In which case, we might simply call it the "zlib" license instead of the OSI's "zlib/libpng" license, which is a bit confusing.
Thoughts?
For SPDX, I suppose it makes sense to take the templated zlib and call it "zlib", and call the libpng variant "libpng", even though I don't think Fedora will ever make that distinction.