From b0678855e5c80ced0259b9feafd8c59bcb4282db516290edf508aba75ce3d2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 12 Oct 2020 06:51:50 +0000 Subject: [PATCH] Accepting request 840459 from home:dimstar:Factory - Fix build with RPM 4.16: error: bare words are no longer supported, please use "...": x86 == ppc. OBS-URL: https://build.opensuse.org/request/show/840459 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python38?expand=0&rev=32 --- python38.changes | 6 ++++++ python38.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/python38.changes b/python38.changes index a1f4de0..8e4e714 100644 --- a/python38.changes +++ b/python38.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 9 16:05:50 UTC 2020 - Dominique Leuenberger + +- Fix build with RPM 4.16: error: bare words are no longer + supported, please use "...": x86 == ppc. + ------------------------------------------------------------------- Fri Sep 25 06:58:03 UTC 2020 - Dominique Leuenberger diff --git a/python38.spec b/python38.spec index 6381655..8e99a9b 100644 --- a/python38.spec +++ b/python38.spec @@ -66,13 +66,13 @@ %define so_minor 0 %define so_version %{python_version_soname}%{abi_kind}-%{so_major}_%{so_minor} # rpm and python have different ideas about what is an arch-dependent name, so: -%if %{__isa_name} == ppc +%if "%{__isa_name}" == "ppc" %define archname %(echo %{_arch} | sed s/ppc/powerpc/) %else %define archname %{_arch} %endif # our arm has Hardware-Floatingpoint -%if %{_arch} == arm +%if "%{_arch}" == "arm" %define armsuffix hf %endif # pyexpat.cpython-35m-x86_64-linux-gnu