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

licensing: fix zlib license translation

Browse source 
The file was mangled, and something about "teeworlds" was inserted
into the line for zlib. The spdx database doesn't list "teeworlds
license", so let's just remove that part.
Both [1] and [2] agree that "zlib" and "zlib license" are the same thing.

[1] https://spdx.org/licenses/Zlib
[2] https://fedoraproject.org/wiki/Licensing:Main#Good_Licenses

Fixes #61.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-12-01 15:40:08 +01:00 committed by ngompa
parent a04e95bc4f
commit 7c00b0f290
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rust2rpm/spdx_to_fedora.csv
View file

@ -306,8 +306,7 @@ Zed License,Zed,Zed,,,
Zend License v2.0,Zend-2.0,Zend,,, Zend License v2.0,Zend-2.0,Zend,,,
Zimbra Public License v1.3,Zimbra-1.3,,,Fedora bad list, Zimbra Public License v1.3,Zimbra-1.3,,,Fedora bad list,
Zimbra Public License v1.4,Zimbra-1.4,,,not on Fedora list, Zimbra Public License v1.4,Zimbra-1.4,,,not on Fedora list,
zlib License,Zlib,"zlib zlib License,Zlib,zlib,,,
Teeworlds",,,Teeworlds License
zlib/libpng License with Acknowledgement,zlib-acknowledgement,zlib with acknowledgement,,, zlib/libpng License with Acknowledgement,zlib-acknowledgement,zlib with acknowledgement,,,
Zope Public License 1.1,ZPL-1.1,,,This specific version not on Fedora list, Zope Public License 1.1,ZPL-1.1,,,This specific version not on Fedora list,
Zope Public License 2.0,ZPL-2.0,ZPLv2.0,,, Zope Public License 2.0,ZPL-2.0,ZPLv2.0,,,

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)
306 Interbase Public License v1.0 Interbase-1.0 added to SPDX-LLv2.2, so was not part of comparison to Fedora list
307 Sendmail License Sendmail added to SPDX-LLv2.2, so was not part of comparison to Fedora list
308 curl License curl added to SPDX-LLv2.3, so was not part of comparison to Fedora list
309 Info-ZIP License Info-ZIP added to SPDX-LLv2.3, so was not part of comparison to Fedora list
Open CASCADE Technology Public License OCCT-PL added to SPDX-LLv2.3, so was not part of comparison to Fedora list
310 Open Government Licence v3.0 Open CASCADE Technology Public License OGL-3.0 OCCT-PL added to SPDX-LLv2.3, so was not part of comparison to Fedora list
311 Norwegian Licence for Open Government Data Open Government Licence v3.0 NLOD-1.0 OGL-3.0 added to SPDX-LLv2.4, so was not part of comparison to Fedora list added to SPDX-LLv2.3, so was not part of comparison to Fedora list
312 FSF All Permissive License Norwegian Licence for Open Government Data FSFAP NLOD-1.0 added to SPDX-LLv2.4, so was not part of comparison to Fedora list