From: Daniel Wagner <dwagner@suse.de>
Date: Wed, 18 May 2022 06:19:23 +0000 (+0200)
Subject: build: Clarify current main project license
X-Git-Tag: v2.1-rc0~50^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c8c6af89fc39ab924590e91973012bebe66aa3d6;p=users%2Fsagi%2Fnvme-cli.git

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 3b7f55f4..cde85273 100644
--- 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 30171eb8..a34d625e 100644
--- 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 f05d0eb6..fe4675a7 100644
--- 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