distro-packages/python-rpm-macros: add proj_delim to package name function
local spec_name_prefix = "python"
-- modname from name
local name = modname
+@@ -53,18 +53,18 @@
+ end
+
+ -- find the spec file
+- specpath = rpm.expand("%_specfile")
++-- specpath = rpm.expand("%_specfile")
+
+ -- search possible locations - shouldn't be necessary anymore
+--- local locations = { rpm.expand("%_sourcedir"), rpm.expand("%_specdir"), posix.getcwd(), posix.getcwd() .. "/" .. name }
+--- for _,loc in ipairs(locations) do
+--- local filename = loc .. "/" .. name .. ".spec"
+--- if posix.stat(filename, "mode") ~= nil then
+--- io.stderr:write("could not find spec as " .. filename .. "\n")
+--- specpath = filename
+--- break
+--- end
+--- end
++ local locations = { rpm.expand("%_specdir"), rpm.expand("%_sourcedir"), posix.getcwd(), posix.getcwd() .. "/" .. name }
++ for _,loc in ipairs(locations) do
++ local filename = loc .. "/" .. name .. ".spec"
++ if posix.stat(filename, "mode") ~= nil then
++ io.stderr:write("could not find spec as " .. filename .. "\n")
++ specpath = filename
++ break
++ end
++ end
+ end
+
+ function python_subpackages()
+--- a/functions.lua 2017-12-07 11:46:04.000000000 -0800
++++ b/functions.lua 2017-12-08 14:16:42.000000000 -0800
+@@ -59,7 +59,7 @@
+ if flavor == "python2" and old_python2 then
+ flavor = "python"
+ end
+- local name = flavor .. "-" .. modname
++ local name = flavor .. "-" .. modname .. "-ohpc"
+ if subpkg and subpkg ~= "" then
+ name = name .. "-" .. subpkg
+ end
