From 0e57e898a7d32321be66f4148bfeb7eec6143c9e Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Wed, 21 Apr 2021 15:13:24 +0200 Subject: [PATCH] Remove python-imaging build requirements Resolves: rhbz#1935839 --- python-qrcode.spec | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/python-qrcode.spec b/python-qrcode.spec index cde46b3..23483f2 100644 --- a/python-qrcode.spec +++ b/python-qrcode.spec @@ -12,8 +12,11 @@ BuildArch: noarch BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-imaging BuildRequires: python3-six +%if ! 0%{?rhel} +# RHEL only ships qrcode-core and does not have pillow +BuildRequires: python3-imaging +%endif %global _description\ This module uses the Python Imaging Library (PIL) to allow for the\ @@ -66,18 +69,12 @@ rm -r %{buildroot}%{python3_sitelib}/%{pkgname}/tests ln -s qr %{buildroot}%{_bindir}/qrcode %check -# in lieue of a real test suite -modules=$(find qrcode -name '*.py' \ - | grep -v __init__ \ - | sort \ - | sed -e 's|/|.|g' \ - | sed -e 's|.py$||g'); - - -for m in $modules; -do - %{__python3} -c "import $m" -done +%if 0%{?rhel} +# test method requires PIL +sed -i s/test_render_pil/disabled_render_pil/g qrcode/tests/test_qrcode.py +%endif +PYTHONPATH=%{buildroot}%{python3_sitelib} \ + %{__python3} -m unittest -v qrcode.tests.test_qrcode.QRCodeTests %files -n python3-%{pkgname} %{_bindir}/qr @@ -103,6 +100,10 @@ done %{python3_sitelib}/%{pkgname}/image/__pycache__/base.* %changelog +* Mon Mar 08 2021 Christian Heimes - 6.1-9 +- Resolves: #1935839 Remove python-imaging build requirements for RHEL +- Run unit tests during build + * Fri Apr 16 2021 Mohan Boddu - 6.1-9 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937