From 25355e4a16b62f22a047828bcb81752dcbae94a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 5 May 2020 01:38:35 +0200 Subject: [PATCH] Reuse python.python_altprovides in %python_provide This way, the generator won't re-add the same provide again, keeping rpmlint happy even with the old macro. --- macros.python | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/macros.python b/macros.python index 0044fae..15abf48 100644 --- a/macros.python +++ b/macros.python @@ -59,10 +59,10 @@ end local package = rpm.expand("%{?1}") local vr = rpm.expand("%{?epoch:%{epoch}:}%{version}-%{release}") - local altnames = python.python_altnames(package) + local provides = python.python_altprovides(package, vr) if (string.starts(package, "python3-")) then - for i, altname in ipairs(altnames) do - print("\\nProvides: " .. altname .. " = " .. vr) + for i, provide in ipairs(provides) do + print("\\nProvides: " .. provide) end --Obsoleting the previous default python package (if it doesn't have isa) if (string.sub(package, "-1") ~= ")") then @@ -71,8 +71,8 @@ print(" < " .. vr) end elseif (string.starts(package, "python" .. rpm.expand("%{__default_python3_pkgversion}") .. "-")) then - for i, altname in ipairs(altnames) do - print("\\nProvides: " .. altname .. " = " .. vr) + for i, provide in ipairs(provides) do + print("\\nProvides: " .. provide) end --Obsoleting the previous default python package (if it doesn't have isa) if (string.sub(package, "-1") ~= ")") then