decathorpe/rust2rpm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CDDL mapping

Browse source 
Fedora's Software Good Licenses List:
https://fedoraproject.org/wiki/Licensing:Main#Good_Licenses

has had CDDL-1.0 and CDDL-1.1 distinguished from each other since 2017.

Update our mapping - and remove the incorrect text that CDDL 1.1 might
not be acceptable.

Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name>
This commit is contained in:
Michel Alexandre Salim 2021-11-16 13:40:33 -08:00
parent 21d77319e1
commit 1b5ad32178
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rust2rpm/spdx_to_fedora.csv
View file

@ -66,8 +66,8 @@ CNRI Jython License,CNRI-Jython,Jpython,Jpython License (old),,
CNRI Python License,CNRI-Python,CNRI,CNRI License (Old Python),Check – may not be exact match as per SPDX Matching Guidelines, CNRI Python License,CNRI-Python,CNRI,CNRI License (Old Python),Check – may not be exact match as per SPDX Matching Guidelines,
CNRI Python Open Source GPL Compatible License Agreement,CNRI-Python-GPL-Compatible,,,not on Fedora list, CNRI Python Open Source GPL Compatible License Agreement,CNRI-Python-GPL-Compatible,,,not on Fedora list,
Code Project Open License 1.02,CPOL-1.02,,,Fedora bad list, Code Project Open License 1.02,CPOL-1.02,,,Fedora bad list,
Common Development and Distribution License 1.0,CDDL-1.0,CDDL,Common Development Distribution License,, Common Development and Distribution License 1.0,CDDL-1.0,CDDL-1.0,Common Development Distribution License 1.0,,
Common Development and Distribution License 1.1,CDDL-1.1,CDDL,,"This specific version not on Fedora list. Same as 1.0, but changes name from Sun to Oracle in section 4.1 and adds patent infringement termination clause (section 6.3) – would Fedora also consider “CDDL”?", Common Development and Distribution License 1.1,CDDL-1.1,CDDL-1.1,Common Development Distribution License 1.1,,
Common Public Attribution License 1.0,CPAL-1.0,CPAL,CPAL License 1.0,, Common Public Attribution License 1.0,CPAL-1.0,CPAL,CPAL License 1.0,,
Common Public License 1.0,CPL-1.0,CPL,Common Public License,, Common Public License 1.0,CPL-1.0,CPL,Common Public License,,
Computer Associates Trusted Open Source License 1.1,CATOSL-1.1,CATOSL,,, Computer Associates Trusted Open Source License 1.1,CATOSL-1.1,CATOSL,,,

1 SPDX Full name of License SPDX License Identifier Fedora Short Name Fedora Fullname (if different) Notes Other Fedora Licenses (full name) that use same short identifier and are SPDX License List equivalent (as per SPDX Matching Guidelines)
66 Common Public Attribution License 1.0 CPAL-1.0 CPAL CPAL License 1.0
67 Common Public License 1.0 CPL-1.0 CPL Common Public License
68 Computer Associates Trusted Open Source License 1.1 CATOSL-1.1 CATOSL
69 Condor Public License v1.1 Condor-1.1 Condor Condor Public License
70 Creative Commons Attribution 1.0 CC-BY-1.0 This specific version not on Fedora list
71 Creative Commons Attribution 2.0 CC-BY-2.0 This specific version not on Fedora list
72 Creative Commons Attribution 2.5 CC-BY-2.5 This specific version not on Fedora list
73 Creative Commons Attribution 3.0 CC-BY-3.0 CC-BY