diff --git a/CMakeLists.txt b/CMakeLists.txt index ee738272..7d81c5a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ set (KCOV_INSTALL_DOCDIR "share/doc/kcov" CACHE STRING "Install destination for set (KCOV_INSTALL_MANDIR "share/man" CACHE STRING "Install destination for man documentation") mark_as_advanced (KCOV_INSTALL_BINDIR KCOV_INSTALL_DOCDIR KCOV_INSTALL_MANDIR) -install (FILES ChangeLog COPYING COPYING.externals +install (FILES ChangeLog COPYING COPYING.spdx DESTINATION "${KCOV_INSTALL_DOCDIR}") # ==================================== diff --git a/COPYING.externals b/COPYING.externals deleted file mode 100644 index 4f206baa..00000000 --- a/COPYING.externals +++ /dev/null @@ -1,3 +0,0 @@ -handlebars.js: MIT -tablesorter (mottie): GPLv2 or MIT -jquery: MIT diff --git a/COPYING.spdx b/COPYING.spdx new file mode 100644 index 00000000..621cc27e --- /dev/null +++ b/COPYING.spdx @@ -0,0 +1,4 @@ +kcov: GPL-2.0-only +handlebars.js: MIT +tablesorter (mottie): GPL-2.0-only OR MIT +jquery: MIT diff --git a/Dockerfile b/Dockerfile index 09aba73e..ab1835ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -132,7 +132,7 @@ LABEL org.label-schema.vendor="Kcov" \ org.opencontainers.image.documentation="https://github.com/SimonKagstrom/kcov#readme" \ org.opencontainers.image.source="https://github.com/SimonKagstrom/kcov" \ org.opencontainers.image.vendor="Kcov" \ - org.opencontainers.image.licenses="GPL-2.0" \ + org.opencontainers.image.licenses="GPL-2.0-only AND MIT AND (GPL-2.0-only OR MIT)" \ org.opencontainers.image.created=${BUILD_DATE} \ org.opencontainers.image.version=${RELEASE_VERSION} \ org.opencontainers.image.revision=${VCS_REF}