You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
44 lines
2.0 KiB
44 lines
2.0 KiB
From 1f64bd9564c0cc27d23f5dc5e523f0db46496644 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Mon, 6 May 2019 22:08:07 +0200
|
|
Subject: [PATCH 02/14] licensing: translate GPL[123]+
|
|
|
|
The "+" variants were described in the comment, but not explicitly
|
|
listed in the table. Let's just replace the comment with
|
|
machine-readable lines.
|
|
|
|
Fixes #79.
|
|
---
|
|
rust2rpm/spdx_to_fedora.csv | 15 ++++++---------
|
|
1 file changed, 6 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/rust2rpm/spdx_to_fedora.csv b/rust2rpm/spdx_to_fedora.csv
|
|
index c42e66e..4fc3321 100644
|
|
--- a/rust2rpm/spdx_to_fedora.csv
|
|
+++ b/rust2rpm/spdx_to_fedora.csv
|
|
@@ -141,15 +141,12 @@ GNU Affero General Public License v3.0,AGPL-3.0,AGPLv3,Affero General Public Lic
|
|
GNU Free Documentation License v1.1,GFDL-1.1,,,This specific version not on Fedora list,
|
|
GNU Free Documentation License v1.2,GFDL-1.2,,,This specific version not on Fedora list,
|
|
GNU Free Documentation License v1.3,GFDL-1.3,GFDL,,,
|
|
-GNU General Public License v1.0 only,GPL-1.0,GPLv1,,"For “or later” add + to SPDX or Fedora short identifier:
|
|
-SPDX: GPL-1.0+
|
|
-Fedora: GPLv1+ or GPL+",
|
|
-GNU General Public License v2.0 only,GPL-2.0,GPLv2,,"For “or later” add + to SPDX or Fedora short identifier:
|
|
-SPDX: GPL-2.0+
|
|
-Fedora: GPLv2+",
|
|
-GNU General Public License v3.0 only,GPL-3.0,GPLv3,,"For “or later” add + to SPDX or Fedora short identifier:
|
|
-SPDX: GPL-3.0+
|
|
-Fedora: GPLv3+",
|
|
+GNU General Public License v1.0 only,GPL-1.0,GPLv1,,,
|
|
+GNU General Public License v1.0 or later,GPL-1.0+,GPLv1+,,,
|
|
+GNU General Public License v2.0 only,GPL-2.0,GPLv2,,,
|
|
+GNU General Public License v2.0 or later,GPL-2.0+,GPLv2+,,,
|
|
+GNU General Public License v3.0 only,GPL-3.0,GPLv3,,,
|
|
+GNU General Public License v3.0 or later,GPL-3.0+,GPLv3+,,,
|
|
GNU Lesser General Public License v2.1 only,LGPL-2.1,LGPLv2,,,
|
|
GNU Lesser General Public License v3.0 only,LGPL-3.0,LGPLv3,,,
|
|
GNU Library General Public License v2 only,LGPL-2.0,LGPLv2,,,
|
|
--
|
|
2.22.0.rc3
|
|
|