- here is my attempt to map the old license tags to the license files and the new SPDX tags:
You should not "map", but check the files. Here is my scan (few weeks old)
http://miroslav.suchy.cz/fedora/spdx-reports/scummvm.html
E.g. you missed that audio/soundfont/common.h
is licensed under Zlib license
-- Miroslav Suchy, RHCA Red Hat, Manager, Packit and CPT, #brno, #fedora-buildsys