diff --git a/macros.python b/macros.python index 0ac2b82..e431b92 100644 --- a/macros.python +++ b/macros.python @@ -49,31 +49,30 @@ package = rpm.expand("%{?1}") vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}") if (string.starts(package, "python2-")) then + --No unversioned provides as python2 is not default + elseif (string.starts(package, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then print("\\nProvides: python-") - print(string.sub(package,9,string.len(package))) + l = 8 + string.len(rpm.expand("%{python3_pkgversion}")) + print(string.sub(package,l,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(string.sub(package,l,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 --No unversioned provides as python3_other is not default elseif (string.starts(package, "pypy-")) then --No unversioned provides as pypy is not default + elseif (string.starts(package, "pypy2-")) then + --No unversioned provides as pypy is not default elseif (string.starts(package, "pypy3-")) then --No unversioned provides as pypy is not default elseif (string.starts(package, "python-")) then - --Providing the current default python - print("Provides: python2-") - print(string.sub(package,8,string.len(package))) - print(" = ") - print(vr) + --No unversioned provides needed for unversioned python else print("%python_provide: ERROR: ") print(package) diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 5c11c3b..75de388 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 45%{?dist} +Release: 46%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -73,6 +73,10 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ %changelog +* Fri Jul 12 2019 Miro Hrončok - 3-46 +- %%python_provide: Switch python2 and python3 behavior +- https://fedoraproject.org/wiki/Changes/Python_means_Python3 + * Tue Jul 09 2019 Miro Hrončok - 3-45 - %%python_provide: Don't try to obsolete %%_isa provides