rpms/python-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not generate useless Obsoletes with %{?_isa}

Browse Source
This commit is contained in:
Orion Poplawski 2016-07-12 11:14:21 -06:00
parent c30072e570
commit 81fee785df
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros.python
View File

@ -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(" < ");\

5
python-rpm-macros.spec
View File

@ -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 <orion@cora.nwra.com> 3-10
- Do not generate useless Obsoletes with %%{?_isa}
* Fri May 13 2016 Orion Poplawski <orion@cora.nwra.com> 3-9
- Make python-rpm-macros require python-srpm-macros (bug #1335860)