From 0253c80bd05e32c5f082fe46bcaf04e9fe905cd7165cd8cefc605a4b493f5683 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sat, 7 Nov 2020 23:40:43 +0000 Subject: [PATCH] Accepting request 846840 from home:gmbr3:Active - Fix build with RPM 4.16: error: bare words are no longer supported, please use "...": no == yes. OBS-URL: https://build.opensuse.org/request/show/846840 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pillow?expand=0&rev=102 --- python-Pillow.changes | 6 ++++++ python-Pillow.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/python-Pillow.changes b/python-Pillow.changes index 5d37f01..9eef640 100644 --- a/python-Pillow.changes +++ b/python-Pillow.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 7 16:13:42 UTC 2020 - Callum Farmer + +- Fix build with RPM 4.16: error: bare words are no longer + supported, please use "...": no == yes. + ------------------------------------------------------------------- Wed Aug 19 09:33:48 UTC 2020 - Tomáš Chvátal diff --git a/python-Pillow.spec b/python-Pillow.spec index 9654940..ede511f 100644 --- a/python-Pillow.spec +++ b/python-Pillow.spec @@ -99,10 +99,10 @@ Python Imaging Library by Fredrik Lundh and Contributors. %check %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} PYTHONDONTWRITEBYTECODE=1 -%if %{_arch} == s390 || %{_arch} == s390x +%if "%{_arch}" == "s390" || "%{_arch}" == "s390x" echo "WARNING ignoring tests completely due to https://github.com/python-pillow/Pillow/issues/1204 and segfault" %else -%if %{_arch} == ppc || %{_arch} == ppc64 +%if "%{_arch}" == "ppc" || "%{_arch}" == "ppc64" $python selftest.py --installed || \ echo "WARNING ignore failure https://github.com/python-pillow/Pillow/issues/1204" pytest-%{$python_bin_suffix} --ignore=_build.python2 --ignore=_build.python3 --ignore=_build.pypy3 -v || \