Merge #91 `Fix PR 83`

This commit is contained in:
Igor Raits 2020-06-03 19:37:14 +00:00
commit 91333a9c7c
2 changed files with 4 additions and 4 deletions

View File

@ -231,7 +231,7 @@ Summary: %{source_summary}
%description %description
%wordwrap -v source_description %wordwrap -v source_description
]])) ]]))
set("currentname", "%{source_name}", verbose) explicitset("currentname", "%{source_name}", verbose)
end end
-- %new_package core -- %new_package core
@ -257,7 +257,7 @@ local function new_package(source_name, pkg_name, name_suffix, first, verbose)
end end
if name_suffix then if name_suffix then
print(rpm.expand("%package " .. name_suffix)) print(rpm.expand("%package " .. name_suffix))
set("currentname", "%{source_name}-" .. name_suffix, verbose) explicitset("currentname", "%{source_name}-" .. name_suffix, verbose)
else else
if not source_name then if not source_name then
source_name = pkg_name source_name = pkg_name
@ -271,7 +271,7 @@ local function new_package(source_name, pkg_name, name_suffix, first, verbose)
end end
print(rpm.expand("%package -n " .. pkg_name)) print(rpm.expand("%package -n " .. pkg_name))
end end
set("currentname", pkg_name, verbose) explicitset("currentname", pkg_name, verbose)
end end
end end

View File

@ -214,7 +214,7 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
- When LTO is enabled, fix broken configure files. - When LTO is enabled, fix broken configure files.
* Sat May 30 2020 Nicolas Mailhot <nim@fedoraproject.org> - 156-1 * Sat May 30 2020 Nicolas Mailhot <nim@fedoraproject.org> - 156-1
- Add %new_package macro and associated lua framework. - Add new_package macro and associated lua framework.
* Sat May 23 2020 Nicolas Mailhot <nim@fedoraproject.org> - 155-1 * Sat May 23 2020 Nicolas Mailhot <nim@fedoraproject.org> - 155-1
- forge: add gitea support - forge: add gitea support