forked from rpms/python-rpm-macros
%python_provide: Don't try to obsolete %_isa provides
Based on recent changes in 04769fa014
,
packagers might want to use:
%{?python_provide:%python_provide python2-foo%{?_isa}}
...for backwards compatibility. However the macro adds obsoletes and
since RPM 4.15, obsoletes with %{?_isa} are not possible:
Only package names are allowed in Obsoletes: Obsoletes: python-foo(x86-64) < ...
To allow such usage, %python_provide now only obsoletes if the argument
does not end with ")".
This commit is contained in:
parent
cf8051e7f5
commit
b67b47d5b0
@ -53,11 +53,13 @@
|
||||
print(string.sub(package,9,string.len(package)))
|
||||
print(" = ")
|
||||
print(vr)
|
||||
--Obsoleting the previous default python package
|
||||
print("\\nObsoletes: python-")
|
||||
print(string.sub(package,9,string.len(package)))
|
||||
print(" < ")
|
||||
print(vr)
|
||||
--Obsoleting the previous default python package (if it doesn't have isa)
|
||||
if (string.sub(package, "-1") ~= ")") then
|
||||
print("\\nObsoletes: python-")
|
||||
print(string.sub(package,9,string.len(package)))
|
||||
print(" < ")
|
||||
print(vr)
|
||||
end
|
||||
elseif (string.starts(package, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then
|
||||
--No unversioned provides as python3 is not default
|
||||
elseif (rpm.expand("%{?python3_other_pkgversion}") ~= "" and string.starts(package, "python" .. rpm.expand("%{python3_other_pkgversion}") .. "-")) then
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: python-rpm-macros
|
||||
Version: 3
|
||||
Release: 44%{?dist}
|
||||
Release: 45%{?dist}
|
||||
Summary: The unversioned Python RPM macros
|
||||
|
||||
License: MIT
|
||||
@ -73,6 +73,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 09 2019 Miro Hrončok <mhroncok@redhat.com> - 3-45
|
||||
- %%python_provide: Don't try to obsolete %%_isa provides
|
||||
|
||||
* Mon Jun 17 2019 Miro Hrončok <mhroncok@redhat.com> - 3-44
|
||||
- Make %%__python /usr/bin/python once again until we are ready
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user