build: Clarify current main project license

The original desired license for the project was GPL-2.0-or-later
but during the development a few files (e.g. fabrics.c and nvme.h)
got added which are licensed as GPL-2.0-only, which renders the
whole project to GPL-2.0-only.

Update the meson license field and the nvme.spec license field.
While at it mentions this in the contributions notes as well.

Signed-off-by: Daniel Wagner <dwagner@suse.de>

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3b7f55f4ed3c6109ed8658255fba4cd4e9b5e693..cde852734ea5f0167f7cd276736a67178d8d221b 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,11 @@ Contributions and new ideas are most welcome!
 
 **NOTE: If you do decide to implement code changes and contribute them,
 please make sure you agree your contribution can be made available
-under the [GPLv2-style License used for the NVMe CLI](https://github.com/linux-nvme/nvme-cli/blob/master/LICENSE).**
+under the [GPLv2-style License used for the NVMe CLI](https://github.com/linux-nvme/nvme-cli/blob/master/LICENSE).
+(SPDX-License-Identifier: GPL-2.0-or-later)**
+
+Because there are a few files licensed under GPL-2.0-only, the whole
+project is tagged as GPL-2.0-only and not as GPL-2.0-or-later.
 
 ### Code Contributions
 

diff --git a/meson.build b/meson.build
index 30171eb841fa7892a39c0b770d9f0dddf54c5ff9..a34d625ee31be53446dcc6fd1b13b65fbc848c41 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@
 project(
     'nvme-cli', ['c', 'cpp'],
     meson_version: '>= 0.47.0',
-    license: 'LGPLv2+',
+    license: 'GPL-2.0-only',
     version: '2.0',
     default_options: [
       'c_std=gnu99',

diff --git a/nvme.spec.in b/nvme.spec.in
index f05d0eb68e7b4f60a020b6dbf03dbf52b2a2e5e1..fe4675a7bb0b12c7b65ba194d38ff04880e05729 100644 (file)
--- a/nvme.spec.in
+++ b/nvme.spec.in
@@ -2,7 +2,7 @@ Name:           nvme
 Version:       @VERSION@
 Release:       1%{?dist}
 Summary:       Core nvme tools
-License:       GPL
+License:       GPL-2.0-only
 Group:                 Development/Tools
 URL:           https://github.com/linux-nvme/nvme-cli/
 Provides:      nvme