From 608a3b9b3b3c49fa8f1b72e56741513497669a8a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Jan 14 2016 22:35:47 +0000 Subject: Handle python3_other_pkgversion in python_provide; Drop duplicate py3_other macros from macros.python --- diff --git a/macros.python b/macros.python index 65a7e5b..3abaae2 100644 --- a/macros.python +++ b/macros.python @@ -33,8 +33,10 @@ CFLAGS="%{optflags}" %{__python} %{py_setup} %{?py_setup_args} install -O1 --ski print(string.sub(package,9,string.len(package)));\ print(" < ");\ print(vr);\ - elseif (string.starts(package, "python3-")) then\ + elseif (string.starts(str, "python" .. rpm.expand("%{python3_pkgversion}") .. "-")) then\ --No unversioned provides as python3 is not default\ + elseif (rpm.expand("%{?python3_other_pkgversion}") != "" and string.starts(str, "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, "pypy3-")) then\