Do not use %{?_isa} in obsoletes/provides for noarch sub-packages
This commit is contained in:
parent
b3d3b56869
commit
b2fc537309
@ -16,15 +16,19 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski
|
|||||||
package = rpm.expand("%{?1:%{1}}");\
|
package = rpm.expand("%{?1:%{1}}");\
|
||||||
vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}")
|
vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}")
|
||||||
if (string.starts(package, "python2-")) then\
|
if (string.starts(package, "python2-")) then\
|
||||||
str = "Provides: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr;\
|
if (rpm.expand("%{?buildarch}") != "noarch") then\
|
||||||
print(rpm.expand(str));\
|
str = "Provides: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr;\
|
||||||
|
print(rpm.expand(str));\
|
||||||
|
end\
|
||||||
print("\\nProvides: python-");\
|
print("\\nProvides: python-");\
|
||||||
print(string.sub(package,9,string.len(package)));\
|
print(string.sub(package,9,string.len(package)));\
|
||||||
print(" = ");\
|
print(" = ");\
|
||||||
print(vr);\
|
print(vr);\
|
||||||
--Obsoleting the previous default python package\
|
--Obsoleting the previous default python package\
|
||||||
str = "\\nObsoletes: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} < " .. vr;\
|
if (rpm.expand("%{?buildarch}") != "noarch") then\
|
||||||
print(rpm.expand(str));\
|
str = "\\nObsoletes: python-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} < " .. vr;\
|
||||||
|
print(rpm.expand(str));\
|
||||||
|
end\
|
||||||
print("\\nObsoletes: python-");\
|
print("\\nObsoletes: python-");\
|
||||||
print(string.sub(package,9,string.len(package)));\
|
print(string.sub(package,9,string.len(package)));\
|
||||||
print(" < ");\
|
print(" < ");\
|
||||||
|
Loading…
Reference in New Issue
Block a user