From 7c00b0f29085166b1a89aec766945b10dc7aca23 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Jan 26 2019 11:22:31 +0000 Subject: licensing: fix zlib license translation 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. --- diff --git a/rust2rpm/spdx_to_fedora.csv b/rust2rpm/spdx_to_fedora.csv index 829571a..1ca5a7e 100644 --- a/rust2rpm/spdx_to_fedora.csv +++ b/rust2rpm/spdx_to_fedora.csv @@ -306,8 +306,7 @@ Zed License,Zed,Zed,,, Zend License v2.0,Zend-2.0,Zend,,, Zimbra Public License v1.3,Zimbra-1.3,,,Fedora bad list, Zimbra Public License v1.4,Zimbra-1.4,,,not on Fedora list, -zlib License,Zlib,"zlib -Teeworlds",,,Teeworlds License +zlib License,Zlib,zlib,,, 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 2.0,ZPL-2.0,ZPLv2.0,,,