From b2fc53730953ac0a9532850bc40a2c5d3c6c6f3b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 14 Jan 2016 15:25:24 -0700 Subject: [PATCH] Do not use %{?_isa} in obsoletes/provides for noarch sub-packages --- macros.python | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/macros.python b/macros.python index 4a5cb2a..3dea0e6 100644 --- a/macros.python +++ b/macros.python @@ -16,15 +16,19 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski package = rpm.expand("%{?1:%{1}}");\ vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}") if (string.starts(package, "python2-")) then\ - str = "Provides: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr;\ - print(rpm.expand(str));\ + if (rpm.expand("%{?buildarch}") != "noarch") then\ + str = "Provides: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr;\ + print(rpm.expand(str));\ + end\ print("\\nProvides: python-");\ print(string.sub(package,9,string.len(package)));\ print(" = ");\ print(vr);\ --Obsoleting the previous default python package\ - str = "\\nObsoletes: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} < " .. vr;\ - print(rpm.expand(str));\ + if (rpm.expand("%{?buildarch}") != "noarch") then\ + str = "\\nObsoletes: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} < " .. vr;\ + print(rpm.expand(str));\ + end\ print("\\nObsoletes: python-");\ print(string.sub(package,9,string.len(package)));\ print(" < ");\