From: Karel Zak <kzak@redhat.com>
Date: Thu, 16 Aug 2018 12:47:21 +0000 (+0200)
Subject: docs: use SPDX license names
X-Git-Tag: v2.33-rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4189907e6cd9a973c3d6ee9e90f92ed7fd7429bb;p=thirdparty%2Futil-linux.git

docs: use SPDX license names

Let's use standardized names for licenses. The names used by SPDX
makes things more obvious at first glance. For complete list see:
https://spdx.org/licenses/

Note, this commit does not change any license or so...

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/Documentation/licenses/COPYING.BSD-3 b/Documentation/licenses/COPYING.BSD-3-Clause
similarity index 100%
rename from Documentation/licenses/COPYING.BSD-3
rename to Documentation/licenses/COPYING.BSD-3-Clause
diff --git a/Documentation/licenses/COPYING.UCB b/Documentation/licenses/COPYING.BSD-4-Clause-UC
similarity index 100%
rename from Documentation/licenses/COPYING.UCB
rename to Documentation/licenses/COPYING.BSD-4-Clause-UC
diff --git a/Documentation/licenses/COPYING.GPLv2 b/Documentation/licenses/COPYING.GPL-2.0-or-later
similarity index 100%
rename from Documentation/licenses/COPYING.GPLv2
rename to Documentation/licenses/COPYING.GPL-2.0-or-later
diff --git a/Documentation/licenses/COPYING.LGPLv2.1 b/Documentation/licenses/COPYING.LGPL-2.1-or-later
similarity index 100%
rename from Documentation/licenses/COPYING.LGPLv2.1
rename to Documentation/licenses/COPYING.LGPL-2.1-or-later
diff --git a/README.licensing b/README.licensing
index 91e07871c6..5752a95840 100644
--- a/README.licensing
+++ b/README.licensing
@@ -2,19 +2,21 @@
 The project util-linux doesn't use the same license for all of the code.
 There is code under:
 
-   * GPLv2+ (GNU General Public License version 2, or any later version)
+   * GPL-2.0-or-later   - GNU General Public License version 2, or any later version
 
-   * GPLv2 (GNU General Public License version 2)
+   * GPL-2.0            - GNU General Public License version 2
 
-   * LGPLv2+ (GNU Lesser General Public License v2 (or 2.1) or any later version)
+   * LGPL-2.1-or-later  - GNU Lesser General Public License 2.1 or any later version
 
-   * BSD with advertising
+   * BSD-3-Clause       - BSD 3-Clause "New" or "Revised" License
+
+   * BSD-4-Clause-UC    - BSD 4-Clause University of California-Specific
 
    * Public Domain
 
 Please, check the source code for more details. A license is usually at the start
 of each source file.
 
-The ./COPYING file (GPLv2+) is the default license for code without an explicitly
-defined license.
+The ./COPYING file (GPL-2.0-or-later) is the default license for code without
+an explicitly defined license.
 
diff --git a/libblkid/COPYING b/libblkid/COPYING
index be1a5b3a18..1c4252aec3 100644
--- a/libblkid/COPYING
+++ b/libblkid/COPYING
@@ -5,4 +5,4 @@ version 2.1 of the License, or (at your option) any later
 version.
 
 The complete text of the license is available in the
-../Documentation/licenses/COPYING.LGPLv2.1 file.
+../Documentation/licenses/COPYING.LGPL-2.1-or-later file.
diff --git a/libfdisk/COPYING b/libfdisk/COPYING
index be1a5b3a18..1c4252aec3 100644
--- a/libfdisk/COPYING
+++ b/libfdisk/COPYING
@@ -5,4 +5,4 @@ version 2.1 of the License, or (at your option) any later
 version.
 
 The complete text of the license is available in the
-../Documentation/licenses/COPYING.LGPLv2.1 file.
+../Documentation/licenses/COPYING.LGPL-2.1-or-later file.
diff --git a/libmount/COPYING b/libmount/COPYING
index be1a5b3a18..db5ec32eb7 100644
--- a/libmount/COPYING
+++ b/libmount/COPYING
@@ -5,4 +5,4 @@ version 2.1 of the License, or (at your option) any later
 version.
 
 The complete text of the license is available in the
-../Documentation/licenses/COPYING.LGPLv2.1 file.
+../Documentation/licenses/COPYING.LGPL-2.1-or-later
diff --git a/libsmartcols/COPYING b/libsmartcols/COPYING
index be1a5b3a18..1c4252aec3 100644
--- a/libsmartcols/COPYING
+++ b/libsmartcols/COPYING
@@ -5,4 +5,4 @@ version 2.1 of the License, or (at your option) any later
 version.
 
 The complete text of the license is available in the
-../Documentation/licenses/COPYING.LGPLv2.1 file.
+../Documentation/licenses/COPYING.LGPL-2.1-or-later file.
diff --git a/libuuid/COPYING b/libuuid/COPYING
index 0e902cf8cd..8a409361fd 100644
--- a/libuuid/COPYING
+++ b/libuuid/COPYING
@@ -2,4 +2,4 @@ This library is free software; you can redistribute it and/or
 modify it under the terms of the Modified BSD License.
 
 The complete text of the license is available in the
-../Documentation/licenses/COPYING.BSD-3 file.
+../Documentation/licenses/COPYING.BSD-3-Clause file.