From 9c506b5c4fe457944fbbfd51dec5a3f663995cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 5 Oct 2022 11:29:44 +0200 Subject: [PATCH] remove the license list, depend on rpmlint-fedora-license-data instead --- licenses.toml | 340 -------------------------------------------------- rpmlint.spec | 9 +- 2 files changed, 6 insertions(+), 343 deletions(-) delete mode 100644 licenses.toml diff --git a/licenses.toml b/licenses.toml deleted file mode 100644 index dc6520f..0000000 --- a/licenses.toml +++ /dev/null @@ -1,340 +0,0 @@ -# taken from Fedora's rpmlint 1.11 -# FIXME should be revisited and updated - -# Package scriptlet interpreters -ValidLicenses = [ - # These are the SPDX identifiers for the Fedora approved licenses. - '0BSD', - 'AAL', - 'Abstyles', - 'Adobe-2006', - 'Adobe-Glyph', - 'ADSL', - 'AFL-2.0', - 'AFL-3.0', - 'Afmparse', - 'AGPL-1.0-only', - 'AGPL-3.0-only', - 'AGPL-3.0-or-later', - 'AMDPLPA', - 'AML', - 'AMPAS', - 'ANTLR-PD', - 'Apache-1.0', - 'Apache-1.1', - 'Apache-2.0', - 'APAFML', - 'App-s2p', - 'APSL-2.0', - 'ARL', - 'Arphic-1999', - 'Artistic-1.0-Perl', - 'Artistic-2.0', - 'Baekmuk', - 'Bahyph', - 'Barr', - 'Beerware', - 'Bitstream-Vera', - 'BitTorrent-1.1', - 'Borceux', - 'BSD-2-Clause', - 'BSD-2-Clause-FreeBSD', - 'BSD-2-Clause-Patent', - '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', - 'CECILL-1.1', - 'CECILL-2.0', - 'CECILL-B', - 'CECILL-C', - 'ClArtistic', - 'CNRI-Python', - 'Condor-1.1', - 'CPAL-1.0', - 'CPL-1.0', - 'Crossword', - 'CrystalStacker', - 'CUA-OPL-1.0', - 'Cube', - 'diffmark', - 'DL-DE-BY-2.0', - 'DOC', - 'Dotseqn', - 'DSDP', - 'dvipdfm', - 'ECL-1.0', - 'ECL-2.0', - 'EFL-2.0', - 'eGenix', - 'Entessa', - 'EPICS', - 'EPL-1.0', - 'EPL-2.0', - '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-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', - 'HPND', - 'ICU', - 'IJG', - 'ImageMagick', - 'iMatix', - 'Imlib2', - 'Intel-ACPI', - 'Interbase-1.0', - 'IPA', - 'IPL-1.0', - 'ISC', - 'JasPer-2.0', - 'LAL-1.3', - 'Latex2e', - 'Leptonica', - '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', - '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', - 'MirOS', - 'MIT', - 'MIT-0', - 'MIT-advertising', - 'MIT-CMU', - 'MIT-enna', - 'MIT-feh', - 'MIT-Modern-Variant', - 'MITNFA', - 'MIT-open-group', - 'Motosoto', - 'mpich2', - 'MPL-1.0', - 'MPL-1.1', - 'MPL-2.0', - 'mplus', - 'MS-PL', - 'MS-RL', - 'MTLL', - 'Mup', - 'Naumen', - 'NCSA', - 'Newsletr', - 'NGPL', - 'NIST-PD-fallback', - 'NLPL', - 'Nokia', - 'NOSL', - 'Noweb', - 'NPL-1.0', - 'NRL', - 'NTP', - 'ODbl-1.0', - 'OFL-1.1', - 'OGL-UK-3.0', - 'OLDAP-2.8', - 'OML', - 'OpenSSL', - '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', - 'Python-2.0.1', - 'Qhull', - 'QPL-1.0', - 'Rdisc', - 'RPSL-1.0', - 'Ruby', - 'Saxpath', - 'SCEA', - 'Sendmail-8.23', - 'SGI-B-2.0', - 'SISSL', - 'Sleepycat', - 'SMLNJ', - 'SNIA', - 'Spencer-86', - 'SPL-1.0', - 'SWL', - 'TCL', - 'TMate', - 'TORQUE-1.1', - 'TOSL', - 'Unicode-DFS-2015', - 'Unlicense', - 'UPL-1.0', - 'Vim', - 'VOSTROM', - 'VSL-1.0', - 'W3C', - 'Wsuipa', - 'WTFPL', - 'Xerox', - 'xinetd', - 'xpp', - 'XSkat', - 'YPL-1.1', - 'Zed', - 'Zend-2.0', - 'Zlib', - 'zlib-acknowledgement', - 'ZPL-2.0', - 'ZPL-2.1', - # Others - 'Redistributable, no modification permitted', - 'Freely redistributable without restriction', -] diff --git a/rpmlint.spec b/rpmlint.spec index 9a8e8e2..bb62deb 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -3,14 +3,13 @@ Name: rpmlint Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for checking common errors in RPM packages License: GPL-2.0-or-later URL: https://github.com/rpm-software-management/rpmlint Source0: %{url}/archive/%{version}/rpmlint-%{version}.tar.gz # Taken from https://github.com/rpm-software-management/rpmlint/tree/main/configs/Fedora Source1: fedora.toml -Source2: licenses.toml Source3: scoring.toml Source4: users-groups.toml Source5: warn-on-functions.toml @@ -33,6 +32,7 @@ Requires: devscripts-checkbashisms Requires: rpm-build Requires: /usr/bin/appstream-util Requires: /usr/bin/desktop-file-validate +Requires: rpmlint-fedora-license-data %description rpmlint is a tool for checking common errors in RPM packages. Binary @@ -61,7 +61,7 @@ sed -i '/^@pytest.mark.no_cover/d' test/test_lint.py %pyproject_save_files %{name} mkdir -p %{buildroot}%{_sysconfdir}/xdg/rpmlint/ -cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{buildroot}%{_sysconfdir}/xdg/rpmlint/ +cp -a %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{buildroot}%{_sysconfdir}/xdg/rpmlint/ %check %if %{with tests} @@ -76,6 +76,9 @@ cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{buildroot}%{_sysc %{_bindir}/rpmlint %changelog +* Wed Oct 05 2022 Miro Hrončok - 2.4.0-2 +- remove the license list, depend on rpmlint-fedora-license-data instead + * Tue Oct 04 2022 Todd Zullinger - 2.4.0-1 - update to 2.4.0 (rhbz#2088759) - use python build-dependency generator