rpms/rpmlint
5
0
Fork 0
Code Issues Pull Requests Releases Activity

update licenses.toml to reflect change in Fedora licensing identifiers

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

444
licenses.toml
View File

@ -3,311 +3,337 @@
# Package scriptlet interpreters # Package scriptlet interpreters
ValidLicenses = [ ValidLicenses = [
# These are the short names for all of the Fedora approved licenses. # These are the SPDX identifiers for 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.
'0BSD', '0BSD',
'AAL', 'AAL',
'Abstyles', 'Abstyles',
'Adobe', 'Adobe-2006',
'Adobe-Glyph',
'ADSL', 'ADSL',
'AFL', 'AFL-2.0',
'AFL-3.0',
'Afmparse', 'Afmparse',
'AGPLv1', 'AGPL-1.0-only',
'AGPLv3', 'AGPL-3.0-only',
'AGPLv3+', 'AGPL-3.0-or-later',
'AGPLv3 with exceptions',
'AMDPLPA', 'AMDPLPA',
'AML', 'AML',
'AMPAS BSD', 'AMPAS',
'ANTLR-PD', 'ANTLR-PD',
'Apache-1.0',
'Apache-1.1',
'Apache-2.0',
'APAFML', 'APAFML',
'App-s2p', 'App-s2p',
'APSL 2.0', 'APSL-2.0',
'ARL', 'ARL',
'Array', 'Arphic-1999',
'Artistic 2.0', 'Artistic-1.0-Perl',
'Artistic clarified', 'Artistic-2.0',
'ASL 1.0', 'Baekmuk',
'ASL 1.1',
'ASL 2.0',
'Bahyph', 'Bahyph',
'Barr', 'Barr',
'Beerware', 'Beerware',
'BeOpen', 'Bitstream-Vera',
'Bibtex', 'BitTorrent-1.1',
'BitTorrent',
'Boost',
'Borceux', 'Borceux',
'BSD', 'BSD-2-Clause',
'BSD-2-Clause-FreeBSD',
'BSD-2-Clause-Patent', 'BSD-2-Clause-Patent',
'BSD Protection', 'BSD-3-Clause',
'BSD with advertising', 'BSD-3-Clause-Attribution',
'BSD with attribution', 'BSD-3-Clause-LBNL',
'CATOSL', 'BSD-4-Clause',
'CC0', 'BSD-Protection',
'CeCILL', 'BSL-1.0',
'CeCILL-B', 'CATOSL-1.1',
'CeCILL-C', '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.0',
'CDDL-1.1', 'CDDL-1.1',
'CNRI', 'CECILL-1.1',
'Condor', 'CECILL-2.0',
'Copyright only', 'CECILL-B',
'CPAL', 'CECILL-C',
'CPL', 'ClArtistic',
'CPM', 'CNRI-Python',
'CRC32', 'Condor-1.1',
'CPAL-1.0',
'CPL-1.0',
'Crossword', 'Crossword',
'Crystal Stacker', 'CrystalStacker',
'CUA-OPL-1.0',
'Cube', 'Cube',
'diffmark', 'diffmark',
'DMIT', 'DL-DE-BY-2.0',
'DOC', 'DOC',
'Dotseqn', 'Dotseqn',
'DSDP', 'DSDP',
'dvipdfm', 'dvipdfm',
'DWPL', 'ECL-1.0',
'ECL 1.0', 'ECL-2.0',
'ECL 2.0', 'EFL-2.0',
'eCos',
'EFL 2.0',
'eGenix', 'eGenix',
'Entessa', 'Entessa',
'EPICS', 'EPICS',
'EPL-1.0', 'EPL-1.0',
'EPL-2.0', 'EPL-2.0',
'ERPL', 'ErlPL-1.1',
'EU Datagrid', 'etalab-2.0',
'EUPL 1.1', 'EUDatagrid',
'EUPL 1.2', 'EUPL-1.1',
'EUPL-1.2',
'Eurosym', 'Eurosym',
'Fair', 'Fair',
'FDK-AAC', 'FDK-AAC',
'FreeBSD-DOC',
'FreeImage',
'FSFAP', 'FSFAP',
'FSFUL', 'FSFUL',
'FSFULLR', 'FSFULLR',
'FTL', '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', 'Giftware',
'GL2PS', 'GL2PS',
'Glide', 'Glide',
'Glulxe', 'Glulxe',
'gnuplot', 'Gnuplot',
'GPL+', 'GPL-1.0-only',
'GPL+ or Artistic', 'GPL-1.0-or-later',
'GPL+ with exceptions', 'GPL-2.0-only',
'GPLv1', 'GPL-2.0-only WITH Classpath-exception-2.0',
'GPLv2 or Artistic', 'GPL-2.0-only WITH Font-exception-2.0',
'GPLv2+ or Artistic', 'GPL-2.0-or-later',
'GPLv2', 'GPL-2.0-or-later WITH Classpath-exception-2.0',
'GPLv2 with exceptions', 'GPL-2.0-or-later WITH eCos-2.0',
'GPLv2+', 'GPL-2.0-or-later WITH Font-exception-2.0',
'GPLv2+ with exceptions', 'GPL-3.0-only',
'GPLv3', 'GPL-3.0-only WITH Classpath-exception-2.0',
'GPLv3 with exceptions', 'GPL-3.0-only WITH Font-exception-2.0',
'GPLv3+', 'GPL-3.0-or-later',
'GPLv3+ with exceptions', 'GPL-3.0-or-later WITH Classpath-exception-2.0',
'GPL-3.0-or-later WITH Font-exception-2.0',
'HaskellReport', 'HaskellReport',
'HSRL', 'HPND',
'IBM', 'ICU',
'IJG', 'IJG',
'ImageMagick', 'ImageMagick',
'iMatix', 'iMatix',
'Imlib2', 'Imlib2',
'Inner-Net', 'Intel-ACPI',
'Intel ACPI', 'Interbase-1.0',
'Interbase', 'IPA',
'IPL-1.0',
'ISC', 'ISC',
'Jabber', 'JasPer-2.0',
'JasPer', 'LAL-1.3',
'JPython',
'Julius',
'Knuth',
'Latex2e', 'Latex2e',
'LBNL BSD',
'Leptonica', 'Leptonica',
'LGPLv2', 'LGPL-2.0-only',
'LGPLv2 with exceptions', 'LGPL-2.0-or-later',
'LGPLv2+', 'LGPL-2.0-or-later WITH FLTK-exception',
'LGPLv2+ or Artistic', 'LGPL-2.0-or-later WITH WxWindows-exception-3.1',
'LGPLv2+ with exceptions', 'LGPL-2.1-only',
'LGPLv3', 'LGPL-2.1-or-later',
'LGPLv3 with exceptions', 'LGPL-2.1-or-later WITH Qwt-exception-1.0',
'LGPLv3+', 'LGPL-3.0-only',
'LGPLv3+ with exceptions', 'LGPL-3.0-or-later',
'Lhcyr',
'libtiff', 'libtiff',
'LLGPL', 'LicenseRef-AHFL',
'Logica', 'LicenseRef-AMS',
'LOSLA', 'LicenseRef-BeOpen',
'LPL', 'LicenseRef-Bibtex',
'LPPL', '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', 'MakeIndex',
'mecab-ipadic',
'midnight',
'Minpack',
'MirOS', 'MirOS',
'MIT', 'MIT',
'MIT-0', 'MIT-0',
'MIT-advertising',
'MIT-CMU',
'MIT-enna',
'MIT-feh',
'MIT-Modern-Variant',
'MITNFA', 'MITNFA',
'MIT with advertising', 'MIT-open-group',
'mod_macro',
'Motosoto', 'Motosoto',
'MPLv1.0', 'mpich2',
'MPLv1.1', 'MPL-1.0',
'MPLv2.0', 'MPL-1.1',
'MPL-2.0',
'mplus',
'MS-PL', 'MS-PL',
'MS-RL', 'MS-RL',
'MTLL', 'MTLL',
'Mup', 'Mup',
'Naumen', 'Naumen',
'NCSA', 'NCSA',
'NetCDF',
'Netscape',
'Newmat',
'Newsletr', 'Newsletr',
'NGPL', 'NGPL',
'NISTSL', 'NIST-PD-fallback',
'NLPL', 'NLPL',
'Nmap',
'Nokia', 'Nokia',
'NOSL', 'NOSL',
'Noweb', 'Noweb',
'OGL', 'NPL-1.0',
'NRL',
'NTP',
'ODbl-1.0',
'OFL-1.1',
'OGL-UK-3.0',
'OLDAP-2.8',
'OML', 'OML',
'OpenLDAP',
'OpenPBS',
'OpenSSL', 'OpenSSL',
'OReilly', 'OPUBL-1.0',
'OSL 1.0', 'OSL-1.0',
'OSL 1.1', 'OSL-1-1',
'OSL 2.0', 'OSL-2.0',
'OSL 2.1', 'OSL-2.1',
'OSL 3.0', 'OSL-3.0',
'Par', 'PDDL-1.0',
'Phorum', 'PHP-3.01',
'PHP',
'PlainTeX',
'Plexus', 'Plexus',
'PostgreSQL', 'PostgreSQL',
'psfrag', 'psfrag',
'psutils', 'psutils',
'Public Domain', 'Python-2.0.1',
'Python',
'Qhull', 'Qhull',
'QPL', 'QPL-1.0',
'radvd',
'Rdisc', 'Rdisc',
'REX', 'RPSL-1.0',
'RiceBSD',
'Romio',
'RPSL',
'RSA',
'Rsfs',
'Ruby', 'Ruby',
'Saxpath', 'Saxpath',
'Sequence',
'SCEA', 'SCEA',
'SCRIP', 'Sendmail-8.23',
'Sendmail', 'SGI-B-2.0',
'Sleepycat',
'SISSL', 'SISSL',
'SLIB', 'Sleepycat',
'SMLNJ',
'SNIA', 'SNIA',
'softSurfer', 'Spencer-86',
'SPL', 'SPL-1.0',
'STMPL',
'SWL', 'SWL',
'TCGL',
'TCL', 'TCL',
'Teeworlds',
'TGPPL',
'TGPPL with exceptions',
'Threeparttable',
'TMate', 'TMate',
'Tolua', 'TORQUE-1.1',
'TORQUEv1.1',
'TOSL', 'TOSL',
'TPDL', 'Unicode-DFS-2015',
'TPL',
'TTWL',
'Tumbolia',
'UCAR',
'UCD',
'Unicode',
'Unlicense', 'Unlicense',
'UPL', 'UPL-1.0',
'Vim', 'Vim',
'VNLSL',
'VOSTROM', 'VOSTROM',
'VSL', 'VSL-1.0',
'W3C', 'W3C',
'Webmin',
'Wsuipa', 'Wsuipa',
'WTFPL', 'WTFPL',
'wxWidgets',
'wxWindows',
'Xerox', 'Xerox',
'xinetd', 'xinetd',
'xpp', 'xpp',
'XSkat', 'XSkat',
'YPLv1.1', 'YPL-1.1',
'Zed', 'Zed',
'Zend', 'Zend-2.0',
'zlib', 'Zlib',
'zlib with acknowledgement', 'zlib-acknowledgement',
'ZPLv1.0', 'ZPL-2.0',
'ZPLv2.0', 'ZPL-2.1',
'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',
# Others # Others
'Redistributable, no modification permitted', 'Redistributable, no modification permitted',
'Freely redistributable without restriction', 'Freely redistributable without restriction',

5
rpmlint.spec
View File

@ -2,7 +2,7 @@
Name: rpmlint Name: rpmlint
Version: 2.2.0 Version: 2.2.0
Release: 6%{?dist} Release: 7%{?dist}
Summary: Tool for checking common errors in RPM packages Summary: Tool for checking common errors in RPM packages
License: GPLv2 License: GPLv2
URL: https://github.com/rpm-software-management/rpmlint URL: https://github.com/rpm-software-management/rpmlint
@ -70,6 +70,9 @@ cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{buildroot}%{_sysc
%{python3_sitelib}/rpmlint* %{python3_sitelib}/rpmlint*
%changelog %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 * 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 - Require desktop-file-validate to avoid a fatal error when the RPM has .desktop files