Commit Graph

258 Commits

Author SHA1 Message Date
Todd Zullinger
3b8cdae343 handle license exception in grouping, better (rhbz#2175241)
Apply upstream commits 48aa148b (TagsCheck: restore space exclusion to
license_exception_regex, 2023-03-20)¹ and 65abdbd3 (TagsCheck: handle
license exception in first item of a grouping, 2023-03-20)² to improve
the handling of license exceptions within groupings.

¹ https://github.com/rpm-software-management/rpmlint/commit/48aa148b
² https://github.com/rpm-software-management/rpmlint/commit/65abdbd3
2023-03-20 11:22:58 -04:00
Todd Zullinger
3203e77b1d handle license exception in grouping (rhbz#2175241)
Apply upstream commit 7d707f7f (TagsCheck: handle license exception in
grouping, 2023-03-03)¹.

Use git to apply patches in %autosetup, it handles binary diffs, such as
the one we're adding here which adds an rpm file to the test suite.

¹ https://github.com/rpm-software-management/rpmlint/commit/7d707f7f
2023-03-06 17:28:19 -05:00
Fedora Release Engineering
7cd94cb3f7 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-20 19:58:37 +00:00
Todd Zullinger
5b2a17f478 ignore missing-hash-section error
Upstream glibc removed the .hash section after a long deprecation
period.  Unfortunately, the deprecation was not widely known and caused
issues for some proprietary software.  This has led to the .hash section
being added to glibc again (at least temporarily), but many/most of the
packages in Fedora have been built with only the .gnu.hash section.

Producing an error for all of these packages is counter-productive, as
the packagers building them have little control over this area.  Ignore
the error by default.

Resolves: #2132969
2022-10-08 12:28:56 -04:00
Todd Zullinger
178007d39d fix broken regex for no-manual-page-for-binary check
Apply upstream patch to fix regression in no-manual-page-for-binary
check.

Convert to %autosetup as well; adding %patch lines manually is a hassle.

Resolves: #2132936
2022-10-08 12:07:26 -04:00
Todd Zullinger
670d708754 disable various errors/warnings for debug/devel packages
Several filter expressions for `*-debuginfo` and `*-debugsource`
packages had leading space which prevented them from matching as
intended.  Remove those spaces.

Ignore no-binary error for `*-debugsource` and `*-devel` packages.
Neither should be required to contain binaries or be noarch.

Remove unnecessary `no-cleaning-of-buildroot` and `files-attr-not-set`
filters.  These are no longer present upstream.  The buildroot check was
removed in b1a8a422 (Remove obsolete check no-cleaning-of-buildroot,
2022-06-22), released in rpmlint-2.4.0.  The file attr check was removed
in 221ce4b2 (remove files-attr-not-set check, 2015-05-19), released in
rpmlint-1.9.
2022-10-07 23:31:14 -04:00
Miro Hrončok
9c506b5c4f remove the license list, depend on rpmlint-fedora-license-data instead 2022-10-05 11:29:44 +02:00
Todd Zullinger
13c5a62db1 own %{_sysconfdir}/xdg/rpmlint directory
Avoid creating an unowned directory.
2022-10-04 16:50:53 -04:00
Todd Zullinger
5e52b632f1 update to 2.4.0 (rhbz#2088759)
Replace manual BuildRequires with automatic python build-dependency
generator.  This also requires replacing %py3_build/%py3_install with
the more modern %pyproject_wheel/%pyproject_install macros.

Make use of %pyproject_save_files and %pyproject_files in the process,
to ensure we keep up with any future changes in the python deployment
process.

Note that %pyproject_save_files includes `%license COPYING` so we don't
need to list it separately.

Make test dependencies conditional on `--with tests` (which is the
default).

While here, re-order the BuildRequires and Requires sections.
2022-10-04 16:48:57 -04:00
Todd Zullinger
4cc3a95149 replace tabs with spaces (again)
The spec file has seen tabs versus spaces fixes a number of times now.
In 096bf89 (2.0.0, 2021-06-03), the spec file was rewritten and all
spaces were replaced with tabs in the tags.  Previous fixes included:

    - dbfdbf0 (Fix mixed-use-of-spaces-and-tabs warning (in this spec
      file), 2018-06-17)
    - c74c9bf (Fix mixed-use-of-spaces-and-tabs warning, 2018-05-03)
    - 85118ac (... Keep consistent between spaces and tabs, 2005-03-04)

Replace tabs once again as they are not commonly used in spec files and
lead to rpmlint warnings.  If we cannot avoid such warnings here, it's a
bit silly to expect others to do so.
2022-10-04 13:21:38 -04:00
Todd Zullinger
869be6c50b enable tests by default
We BR the test dependencies unconditionally.  Run the tests as well.

Avoid warnings about pytest.mark.no_cover marker; we disable disable
coverage entirely.
2022-10-04 13:21:38 -04:00
Todd Zullinger
cba2f8a237 convert license to SPDX and correct to GPL-2.0-or-later
It's not clear to me if or when the license changed from GPL-2.0-only to
GPL-2.0-or-later.  It may have been more of a clarification than a
change upstream.

In any case, GPL-2.0-or-later is what upstream states in setup.py and
their spec file (the latter as GPLv2+):

    https://github.com/rpm-software-management/rpmlint/blob/2.3.0/setup.py#L20
    https://github.com/rpm-software-management/rpmlint/blob/2.3.0/.packit/rpmlint.spec#L8
2022-10-04 13:21:32 -04:00
Todd Zullinger
da60f2928b update to 2.3.0 (rhbz#2088759)
Sync the fedora.toml and users-groups.toml configs from upstream.

Change the zstd dependency to zstandard, following upstream 463bef3f
(Use different Python package for ZStandard, 2022-01-03).

Adjust python-magic dependency to file-magic.  We already BR file-magic for
the test suite.  This ensures we install what we tested and avoids the
problem of python3-file-magic conflicting and obsoleting python3-magic
without providing the same python-dist values¹.

¹ https://bugzilla.redhat.com/1899279
2022-10-04 13:20:33 -04:00
spotrh
2beb19345e update licenses.toml to reflect change in Fedora licensing identifiers 2022-09-24 13:24:40 -04:00
Miro Hrončok
2c28889298 Be consistent in what we (Build)Require 2022-08-09 17:57:29 +02:00
Miro Hrončok
4fb672c59c Require desktop-file-validate to avoid a fatal error when the RPM has .desktop files 2022-08-08 14:10:09 +02:00
Fedora Release Engineering
daaf84eeef Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 01:03:23 +00:00
Python Maint
860b80b506 Rebuilt for Python 3.11 2022-06-14 16:55:20 +02:00
Fedora Release Engineering
2c67bcb69d - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-21 18:03:31 +00:00
Tom spot Callaway
73ebf18e2c disable no-library-dependency-for/on checks in Fedora 2022-01-06 16:48:00 -05:00
Stephen Smoogen
8c17654054 Updated spec file to 2.2.0 and removed un-used patches
Uploaded new source to look-aside
2021-12-10 10:30:49 -05:00
Neal Gompa
fe6868ba1e Fix some rpmlint policy issues 2021-12-07 08:07:36 -05:00
Tom spot Callaway
a80a7e3835 add explicit Requires for pyenchant 2021-10-05 15:36:31 -04:00
Tom spot Callaway
256a77a06f fix rpmlintrc load from cmdline option (bz2000018) 2021-09-17 10:15:26 -04:00
Miro Hrončok
cfe9d89a45 Ignore hidden-file-or-dir for .cargo-checksum.json 2021-09-05 20:50:42 +02:00
Tom spot Callaway
5a955c2acc include iso-639-2 collective language codes in LANGUAGES 2021-08-17 17:52:46 -04:00
Tom spot Callaway
3f0db8b75d make tests a with flag 2021-08-17 16:29:27 -04:00
Tom spot Callaway
15be74b1a1 2.1.0 2021-08-17 16:16:13 -04:00
Fedora Release Engineering
4db83c1da5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 11:37:19 +00:00
Tom spot Callaway
437dfc5658 add Requires: rpm-build 2021-07-07 08:52:20 -04:00
Tomas Tomecek
e1e477af55 add runtime require: rpm-build
otherwise spec file cannot be parsed and users are getting this odd
error:

    python-ogr.spec: E: specfile-error rpm: /usr/bin/rpmspec: No such file
    or directory

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2021-07-07 13:50:23 +02:00
Tom spot Callaway
889dc5b76b fix rpmlint -i where it wrongly assumes a tmp dir 2021-07-01 12:19:48 -04:00
Miro Hrončok
a5cb936436 Don't lint the code or measure coverage in %check
Linters and test coverage makes sense in upstream CI, but not that much in Fedora.
This makes testing rpmlint with newer Python releases easier.

It also partially unblocks the Python 3.10 rebuild.
2021-06-05 23:43:13 +02:00
Python Maint
ef464bc81e Rebuilt for Python 3.10 2021-06-04 18:03:28 +02:00
Tom spot Callaway
1baf2ea022 add dash and checkbashisms as requires 2021-06-04 09:45:21 -04:00
Tom spot Callaway
a32a3ca17a more BR 2021-06-03 15:46:51 -04:00
Tom spot Callaway
c7edb61e79 still moar BR 2021-06-03 15:26:44 -04:00
Tom spot Callaway
4f79e2c09f more BR 2021-06-03 15:10:14 -04:00
Tom spot Callaway
096bf89341 2.0.0 2021-06-03 14:59:34 -04:00
Todd Zullinger
65f8e57bd5 use proper folder _sourcedir for spec files
Resolves: https://bugzilla.redhat.com/1959363
Upstream: https://github.com/rpm-software-management/rpmlint/pull/633
2021-05-11 10:01:49 -04:00
Miro Hrončok
8c896377da Filter out empty specfile-errors, they are duplicates
Before:

    $ rpmlint python-setuptools.spec
    python-setuptools.spec: E: specfile-error warning: extra tokens at the end of %endif directive in line 58:  %endif # with tests
    python-setuptools.spec: E: specfile-error
    python-setuptools.spec: E: specfile-error warning: extra tokens at the end of %endif directive in line 67:  %endif # without bootstrap
    python-setuptools.spec: E: specfile-error
    python-setuptools.spec: E: specfile-error warning: extra tokens at the end of %endif directive in line 181:  %endif # with tests
    0 packages and 1 specfiles checked; 5 errors, 0 warnings.

After:

    $ rpmlint python-setuptools.spec
    python-setuptools.spec: E: specfile-error warning: extra tokens at the end of %endif directive in line 58:  %endif # with tests
    python-setuptools.spec: E: specfile-error warning: extra tokens at the end of %endif directive in line 67:  %endif # without bootstrap
    python-setuptools.spec: E: specfile-error warning: extra tokens at the end of %endif directive in line 181:  %endif # with tests
    0 packages and 1 specfiles checked; 3 errors, 0 warnings.
2021-04-13 10:48:05 +02:00
Tom spot Callaway
6f1c44bf23 correct hard-coded version in Makefile 2021-02-05 10:16:26 -05:00
Fedora Release Engineering
44a9bb588a - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 15:28:12 +00:00
Miro Hrončok
77d737a57a Filter out empty py.typed files in Python site-packages 2021-01-25 15:05:32 +01:00
Tom Stellard
00196912df Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-11 19:08:20 +00:00
Miro Hrončok
9d73fed514 Filter out empty REQUESTED files in pip installed Python metadata dist-info dirs 2020-08-21 15:07:34 +02:00
Fedora Release Engineering
b520121e46 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 05:56:22 +00:00
Miro Hrončok
a5d3b021f3 Don't use the %python_sitelib macro, because it errors
See https://fedoraproject.org/wiki/Changes/PythonMacroError
2020-07-16 18:01:14 +02:00
Troy Dawson
9121f405a5 Minor conditional tweak for ELN
Signed-off-by: Troy Dawson tdawson@redhat.com
2020-07-07 15:58:09 +00:00
Tom Callaway
efbe7afa49 use python3-file-magic on f33+ 2020-06-23 09:39:00 -04:00