use python3-file-magic on f33+

This commit is contained in:
Tom Callaway 2020-06-23 09:39:00 -04:00
parent 86c1640949
commit efbe7afa49

View File

@ -20,7 +20,7 @@
Name: rpmlint Name: rpmlint
Version: 1.11 Version: 1.11
Release: 8%{?dist} Release: 9%{?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
@ -61,8 +61,13 @@ BuildRequires: bash-completion
# python-magic and python-enchant are actually optional dependencies, but # python-magic and python-enchant are actually optional dependencies, but
# they bring quite desirable features. # they bring quite desirable features.
%if %{with python3} %if %{with python3}
%if 0%{?fedora} >= 33
Requires: python3-file-magic
BuildRequires: python3-file-magic
%else
Requires: python3-magic Requires: python3-magic
BuildRequires: python3-magic BuildRequires: python3-magic
%endif
Requires: python3-enchant Requires: python3-enchant
%else %else
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7
@ -153,6 +158,9 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
%{_mandir}/man1/rpmlint.1* %{_mandir}/man1/rpmlint.1*
%changelog %changelog
* Tue Jun 23 2020 Tom Callaway <spot@fedoraproject.org> - 1.11-9
- use python3-file-magic on f33+
* Tue Jun 16 2020 Tom Callaway <spot@fedoraproject.org> - 1.11-8 * Tue Jun 16 2020 Tom Callaway <spot@fedoraproject.org> - 1.11-8
- turn *-not-linked-against-libc from errors to warnings (bz1749738) - turn *-not-linked-against-libc from errors to warnings (bz1749738)