macros: entirely remove the Release defined warning
This seems to cause false positives. Let's nix it completely.
This commit is contained in:
parent
a2fe6e5923
commit
d8a5b8c184
2 changed files with 2 additions and 15 deletions
|
|
@ -77,6 +77,8 @@ print(rpm.expand("%autosetup %{-v} %{-N} %{?-S} %{?-p} %{?forgesetupargs" .. rpm
|
|||
# This follows the new Versioning Guidelines that discourage putting release
|
||||
# snapshot info in Release.
|
||||
#
|
||||
# NOTE: %forgeversion MUST be invoked before setting Release.
|
||||
#
|
||||
# If no %forgeversionsuffix<number> is set,
|
||||
# the value is equivalent to %version.
|
||||
#
|
||||
|
|
@ -110,13 +112,6 @@ if util.get_flag("p") then
|
|||
sep = "~"
|
||||
end
|
||||
\
|
||||
-- Release uses %dist and %distprefix, so we need to make sure it's not used before
|
||||
if util.is_defined("release") then
|
||||
rpm.expand(
|
||||
"%{warn:'Version: %%forgeversion' must be invoked before setting Release.}"
|
||||
)
|
||||
end
|
||||
\
|
||||
-- Determine baseversion
|
||||
local baseversion = util.get_flag("b", true) or util.get_macro("version0")
|
||||
if not baseversion then
|
||||
|
|
|
|||
|
|
@ -484,14 +484,6 @@ cases:
|
|||
You must define %version0 (%global version0 <VERSION>) prior to invoking
|
||||
this macro.
|
||||
|
||||
- id: forge_version_error_2
|
||||
defines:
|
||||
version: "1.0.0"
|
||||
release: "0"
|
||||
expected:
|
||||
forgeversion: "1.0.0"
|
||||
stderr_contains: "'Version: %forgeversion' must be invoked before setting Release."
|
||||
|
||||
- id: unit_forge_version
|
||||
defines:
|
||||
- version: "1.0.0"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue