%python_provide: Obsolete and provide py36- from py3-, provide py3- from py36-

The "python36" is intentionally hardcoded and does not use the
%python3_pkgversion macro, as that can be overridden in spec for
various reasons.

See https://lists.fedoraproject.org/archives/list/epel-devel@lists.fedoraproject.org/message/RYDGY4BKYTLYH5IOECMPEZYFUZEXCDRN/
This commit is contained in:
Miro Hrončok 2019-04-25 16:39:04 +02:00
parent 99f8b82d04
commit efb740f820
2 changed files with 28 additions and 3 deletions

View File

@ -51,8 +51,29 @@
print(string.sub(package,9,string.len(package)))
print(" < ")
print(vr)
elseif (string.starts(package, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then
--No unversioned provides as python3 is not default
elseif (string.starts(package, "python3-")) then
if (rpm.expand("%{?buildarch}") ~= "noarch") then
str = "Provides: python36-" .. string.sub(package,9,string.len(package)) .. "%{?_isa} = " .. vr
print(rpm.expand(str))
end
print("\\nProvides: python36-")
print(string.sub(package,9,string.len(package)))
print(" = ")
print(vr)
--Obsoleting the EPEL python36 package
print("\\nObsoletes: python36-")
print(string.sub(package,9,string.len(package)))
print(" < ")
print(vr)
elseif (string.starts(package, "python36-")) then
if (rpm.expand("%{?buildarch}") ~= "noarch") then
str = "Provides: python3-" .. string.sub(package,10,string.len(package)) .. "%{?_isa} = " .. vr
print(rpm.expand(str))
end
print("\\nProvides: python3-")
print(string.sub(package,10,string.len(package)))
print(" = ")
print(vr)
elseif (rpm.expand("%{?python3_other_pkgversion}") ~= "" and string.starts(package, "python" .. rpm.expand("%{python3_other_pkgversion}") .. "-")) then
--No unversioned provides as python3_other is not default
elseif (string.starts(package, "pypy-")) then

View File

@ -1,6 +1,6 @@
Name: python-rpm-macros
Version: 3
Release: 23%{?dist}
Release: 24%{?dist}
Summary: The unversioned Python RPM macros
License: MIT
@ -67,6 +67,10 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5}
%changelog
* Thu Apr 25 2019 Miro Hrončok <mhroncok@redhat.com> - 3-24
- %%python_provide: Obsolete and provide python36- from python3-
- %%python_provide: Provide python3- from python36-
* Thu Jan 31 2019 Miro Hrončok <mhroncok@redhat.com> - 3-23
- Make Python 3.6 the main Python 3 version
- Make Python 3.4 the other Python 3 version