diff --git a/macros.python b/macros.python index 0a7ed0a..94e769c 100644 --- a/macros.python +++ b/macros.python @@ -25,10 +25,6 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski print(" = ");\ print(vr);\ --Obsoleting the previous default python package\ - 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(" < ");\ diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 7014450..d63753d 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -69,6 +69,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %changelog +* Tue Jul 12 2016 Orion Poplawski 3-10 +- Do not generate useless Obsoletes with %%{?_isa} + * Fri May 13 2016 Orion Poplawski 3-9 - Make python-rpm-macros require python-srpm-macros (bug #1335860)