update licenses.toml to reflect change in Fedora licensing identifiers

This commit is contained in:
spotrh 2022-09-24 13:24:40 -04:00
parent 2c28889298
commit 2beb19345e
2 changed files with 239 additions and 210 deletions

View File

@ -3,311 +3,337 @@
# Package scriptlet interpreters
ValidLicenses = [
# These are the short names for all of the Fedora approved licenses.
# The master list is kept here: http://fedoraproject.org/wiki/Licensing
# Last synced with revision "2.53, May 27, 2021" of that page.
# Note that Bcotton is no longer bumping revision.
# These are the SPDX identifiers for the Fedora approved licenses.
'0BSD',
'AAL',
'Abstyles',
'Adobe',
'Adobe-2006',
'Adobe-Glyph',
'ADSL',
'AFL',
'AFL-2.0',
'AFL-3.0',
'Afmparse',
'AGPLv1',
'AGPLv3',
'AGPLv3+',
'AGPLv3 with exceptions',
'AGPL-1.0-only',
'AGPL-3.0-only',
'AGPL-3.0-or-later',
'AMDPLPA',
'AML',
'AMPAS BSD',
'AMPAS',
'ANTLR-PD',
'Apache-1.0',
'Apache-1.1',
'Apache-2.0',
'APAFML',
'App-s2p',
'APSL 2.0',
'APSL-2.0',
'ARL',
'Array',
'Artistic 2.0',
'Artistic clarified',
'ASL 1.0',
'ASL 1.1',
'ASL 2.0',
'Arphic-1999',
'Artistic-1.0-Perl',
'Artistic-2.0',
'Baekmuk',
'Bahyph',
'Barr',
'Beerware',
'BeOpen',
'Bibtex',
'BitTorrent',
'Boost',
'Bitstream-Vera',
'BitTorrent-1.1',
'Borceux',
'BSD',
'BSD-2-Clause',
'BSD-2-Clause-FreeBSD',
'BSD-2-Clause-Patent',
'BSD Protection',
'BSD with advertising',
'BSD with attribution',
'CATOSL',
'CC0',
'CeCILL',
'CeCILL-B',
'CeCILL-C',
'BSD-3-Clause',
'BSD-3-Clause-Attribution',
'BSD-3-Clause-LBNL',
'BSD-4-Clause',
'BSD-Protection',
'BSL-1.0',
'CATOSL-1.1',
'CC0-1.0',
'CC-BY-1.0',
'CC-BY-2.0',
'CC-BY-2.5',
'CC-BY-2.5-AU',
'CC-BY-3.0',
'CC-BY-3.0-AT',
'CC-BY-3.0-DE',
'CC-BY-3.0-NL',
'CC-BY-3.0-US',
'CC-BY-4.0',
'CC-BY-ND-1.0',
'CC-BY-ND-2.0',
'CC-BY-ND-2.5',
'CC-BY-ND-3.0',
'CC-BY-ND-3.0-DE',
'CC-BY-ND-4.0',
'CC-BY-SA-1.0',
'CC-BY-SA-2.0',
'CC-BY-SA-2.0-UK',
'CC-BY-SA-2.1-JP',
'CC-BY-SA-2.5',
'CC-BY-SA-3.0',
'CC-BY-SA-3.0-AT',
'CC-BY-SA-3.0-DE',
'CC-BY-SA-4.0',
'CDDL-1.0',
'CDDL-1.1',
'CNRI',
'Condor',
'Copyright only',
'CPAL',
'CPL',
'CPM',
'CRC32',
'CECILL-1.1',
'CECILL-2.0',
'CECILL-B',
'CECILL-C',
'ClArtistic',
'CNRI-Python',
'Condor-1.1',
'CPAL-1.0',
'CPL-1.0',
'Crossword',
'Crystal Stacker',
'CrystalStacker',
'CUA-OPL-1.0',
'Cube',
'diffmark',
'DMIT',
'DL-DE-BY-2.0',
'DOC',
'Dotseqn',
'DSDP',
'dvipdfm',
'DWPL',
'ECL 1.0',
'ECL 2.0',
'eCos',
'EFL 2.0',
'ECL-1.0',
'ECL-2.0',
'EFL-2.0',
'eGenix',
'Entessa',
'EPICS',
'EPL-1.0',
'EPL-2.0',
'ERPL',
'EU Datagrid',
'EUPL 1.1',
'EUPL 1.2',
'ErlPL-1.1',
'etalab-2.0',
'EUDatagrid',
'EUPL-1.1',
'EUPL-1.2',
'Eurosym',
'Fair',
'FDK-AAC',
'FreeBSD-DOC',
'FreeImage',
'FSFAP',
'FSFUL',
'FSFULLR',
'FTL',
'GFDL-1.1-invariants-only',
'GFDL-1.1-invariants-or-later',
'GFDL-1.1-no-invariants-only',
'GFDL-1.1-no-invariants-or-later',
'GFDL-1.1-only',
'GFDL-1.1-or-later',
'GFDL-1.2-invariants-only',
'GFDL-1.2-invariants-or-later',
'GFDL-1.2-no-invariants-only',
'GFDL-1.2-no-invariants-or-later',
'GFDL-1.2-only',
'GFDL-1.2-or-later',
'GFDL-1.3-invariants-only',
'GFDL-1.3-invariants-or-later',
'GFDL-1.3-no-invariants-or-later',
'GFDL-1.3-only',
'GFDL-1.3-or-later',
'Giftware',
'GL2PS',
'Glide',
'Glulxe',
'gnuplot',
'GPL+',
'GPL+ or Artistic',
'GPL+ with exceptions',
'GPLv1',
'GPLv2 or Artistic',
'GPLv2+ or Artistic',
'GPLv2',
'GPLv2 with exceptions',
'GPLv2+',
'GPLv2+ with exceptions',
'GPLv3',
'GPLv3 with exceptions',
'GPLv3+',
'GPLv3+ with exceptions',
'Gnuplot',
'GPL-1.0-only',
'GPL-1.0-or-later',
'GPL-2.0-only',
'GPL-2.0-only WITH Classpath-exception-2.0',
'GPL-2.0-only WITH Font-exception-2.0',
'GPL-2.0-or-later',
'GPL-2.0-or-later WITH Classpath-exception-2.0',
'GPL-2.0-or-later WITH eCos-2.0',
'GPL-2.0-or-later WITH Font-exception-2.0',
'GPL-3.0-only',
'GPL-3.0-only WITH Classpath-exception-2.0',
'GPL-3.0-only WITH Font-exception-2.0',
'GPL-3.0-or-later',
'GPL-3.0-or-later WITH Classpath-exception-2.0',
'GPL-3.0-or-later WITH Font-exception-2.0',
'HaskellReport',
'HSRL',
'IBM',
'HPND',
'ICU',
'IJG',
'ImageMagick',
'iMatix',
'Imlib2',
'Inner-Net',
'Intel ACPI',
'Interbase',
'Intel-ACPI',
'Interbase-1.0',
'IPA',
'IPL-1.0',
'ISC',
'Jabber',
'JasPer',
'JPython',
'Julius',
'Knuth',
'JasPer-2.0',
'LAL-1.3',
'Latex2e',
'LBNL BSD',
'Leptonica',
'LGPLv2',
'LGPLv2 with exceptions',
'LGPLv2+',
'LGPLv2+ or Artistic',
'LGPLv2+ with exceptions',
'LGPLv3',
'LGPLv3 with exceptions',
'LGPLv3+',
'LGPLv3+ with exceptions',
'Lhcyr',
'LGPL-2.0-only',
'LGPL-2.0-or-later',
'LGPL-2.0-or-later WITH FLTK-exception',
'LGPL-2.0-or-later WITH WxWindows-exception-3.1',
'LGPL-2.1-only',
'LGPL-2.1-or-later',
'LGPL-2.1-or-later WITH Qwt-exception-1.0',
'LGPL-3.0-only',
'LGPL-3.0-or-later',
'libtiff',
'LLGPL',
'Logica',
'LOSLA',
'LPL',
'LPPL',
'LicenseRef-AHFL',
'LicenseRef-AMS',
'LicenseRef-BeOpen',
'LicenseRef-Bibtex',
'LicenseRef-CDL',
'LicenseRef-Charter',
'LicenseRef-CPM',
'LicenseRef-CRC32',
'LicenseRef-DMIT',
'LicenseRef-DMTF',
'LicenseRef-DoubleStroke',
'LicenseRef-DSL',
'LicenseRef-ec',
'LicenseRef-EFML',
'LicenseRef-Elvish',
'LicenseRef-GeoGratis',
'LicenseRef-Hershey',
'LicenseRef-HOFL',
'LicenseRef-IEEE',
'LicenseRef-Jabber',
'LicenseRef-JPython',
'LicenseRef-LDPL',
'LicenseRef-Lhcyr',
'LicenseRef-Liberation',
'LicenseRef-Logica',
'LicenseREf-LOSLA',
'LicenseRef-LPPL',
'LicenseRef-Lucida',
'LicenseRef-MgOpen',
'LicenseRef-midnight',
'LicenseRef-mod_macro',
'LicenseRef-Newmat',
'LicenseRef-OAL',
'LicenseRef-OFSFDL',
'LicenseRef-OpenData',
'LicenseRef-OpenMusic',
'LicenseRef-Par',
'LicenseRef-PlainTeX',
'LicenseRef-PTFL',
'LicenseRef-Public-use',
'LicenseRef-Punknova',
'LicenseRef-radvd',
'LicenseRef-REX',
'LicenseRef-RiceBSD',
'LicenseRef-Romio',
'LicenseRef-RSA',
'LicenseRef-Rsfs',
'LicenseRef-SCRIP',
'LicenseRef-SLIB',
'LicenseRef-softSurfer',
'LicenseRef-STIX',
'LicenseRef-STMPL',
'LicenseRef-TGPPL',
'LicenseRef-Threeparttable',
'LicenseRef-Tolua',
'LicenseRef-Utopia',
'LicenseRef-VNLSL',
'LicenseRef-Wadalab',
'LicenseRef-XANO',
'LicenseRef-ZPLv1.0',
'Linux-man-pages-copyleft',
'LPL-1.02',
'LPPL-1.3a',
'MakeIndex',
'mecab-ipadic',
'midnight',
'Minpack',
'MirOS',
'MIT',
'MIT-0',
'MIT-advertising',
'MIT-CMU',
'MIT-enna',
'MIT-feh',
'MIT-Modern-Variant',
'MITNFA',
'MIT with advertising',
'mod_macro',
'MIT-open-group',
'Motosoto',
'MPLv1.0',
'MPLv1.1',
'MPLv2.0',
'mpich2',
'MPL-1.0',
'MPL-1.1',
'MPL-2.0',
'mplus',
'MS-PL',
'MS-RL',
'MTLL',
'Mup',
'Naumen',
'NCSA',
'NetCDF',
'Netscape',
'Newmat',
'Newsletr',
'NGPL',
'NISTSL',
'NIST-PD-fallback',
'NLPL',
'Nmap',
'Nokia',
'NOSL',
'Noweb',
'OGL',
'NPL-1.0',
'NRL',
'NTP',
'ODbl-1.0',
'OFL-1.1',
'OGL-UK-3.0',
'OLDAP-2.8',
'OML',
'OpenLDAP',
'OpenPBS',
'OpenSSL',
'OReilly',
'OSL 1.0',
'OSL 1.1',
'OSL 2.0',
'OSL 2.1',
'OSL 3.0',
'Par',
'Phorum',
'PHP',
'PlainTeX',
'OPUBL-1.0',
'OSL-1.0',
'OSL-1-1',
'OSL-2.0',
'OSL-2.1',
'OSL-3.0',
'PDDL-1.0',
'PHP-3.01',
'Plexus',
'PostgreSQL',
'psfrag',
'psutils',
'Public Domain',
'Python',
'Python-2.0.1',
'Qhull',
'QPL',
'radvd',
'QPL-1.0',
'Rdisc',
'REX',
'RiceBSD',
'Romio',
'RPSL',
'RSA',
'Rsfs',
'RPSL-1.0',
'Ruby',
'Saxpath',
'Sequence',
'SCEA',
'SCRIP',
'Sendmail',
'Sleepycat',
'Sendmail-8.23',
'SGI-B-2.0',
'SISSL',
'SLIB',
'Sleepycat',
'SMLNJ',
'SNIA',
'softSurfer',
'SPL',
'STMPL',
'Spencer-86',
'SPL-1.0',
'SWL',
'TCGL',
'TCL',
'Teeworlds',
'TGPPL',
'TGPPL with exceptions',
'Threeparttable',
'TMate',
'Tolua',
'TORQUEv1.1',
'TORQUE-1.1',
'TOSL',
'TPDL',
'TPL',
'TTWL',
'Tumbolia',
'UCAR',
'UCD',
'Unicode',
'Unicode-DFS-2015',
'Unlicense',
'UPL',
'UPL-1.0',
'Vim',
'VNLSL',
'VOSTROM',
'VSL',
'VSL-1.0',
'W3C',
'Webmin',
'Wsuipa',
'WTFPL',
'wxWidgets',
'wxWindows',
'Xerox',
'xinetd',
'xpp',
'XSkat',
'YPLv1.1',
'YPL-1.1',
'Zed',
'Zend',
'zlib',
'zlib with acknowledgement',
'ZPLv1.0',
'ZPLv2.0',
'ZPLv2.1',
# Documentation licenses
'CDL',
'FBSDDL',
'GFDL',
'IEEE',
'LDPL',
'OFSFDL',
'Open Publication',
'Public Use',
'Verbatim',
# Content licenses
'CC-BY',
'CC-BY-ND',
'CC-BY-SA',
'DL-DE-BY',
'DMTF',
'DSL',
'EFML',
'Free Art',
'GeoGratis',
'Green OpenMusic',
'OAL',
'Ouverte',
'PDDL-1.0',
# Font licenses
'AMS',
'Arphic',
'AHFL',
'Baekmuk',
'Bitstream Vera',
'Charter',
'DoubleStroke',
'ec',
'Elvish',
'Hershey',
'HOFL',
'IPA',
'Liberation',
'Lucida',
'MgOpen',
'mplus',
'OFL',
'PTFL',
'Punknova',
'STIX',
'Utopia',
'Wadalab',
'XANO',
'Zend-2.0',
'Zlib',
'zlib-acknowledgement',
'ZPL-2.0',
'ZPL-2.1',
# Others
'Redistributable, no modification permitted',
'Freely redistributable without restriction',

View File

@ -2,7 +2,7 @@
Name: rpmlint
Version: 2.2.0
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Tool for checking common errors in RPM packages
License: GPLv2
URL: https://github.com/rpm-software-management/rpmlint
@ -70,6 +70,9 @@ cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{buildroot}%{_sysc
%{python3_sitelib}/rpmlint*
%changelog
* Sat Sep 24 2022 Tom Callaway <spot@fedoraproject.org> - 2.2.0-7
- update licenses.toml to reflect change in Fedora licensing identifiers
* Mon Aug 08 2022 Miro Hrončok <mhroncok@redhat.com> - 2.2.0-6
- Require desktop-file-validate to avoid a fatal error when the RPM has .desktop files