diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2018-11-24 16:50:17 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2018-11-24 16:50:17 +0000 |
| commit | 8206fad9e8545d2d3d984a4b32cc96a5162e0180 (patch) | |
| tree | 054ff5da0d7c87fc618e048df3e1ed266ccf2b9a | |
| parent | 772a5002aa406ec18a2a009b079163b318a94e68 (diff) | |
| download | puppet-8206fad9e8545d2d3d984a4b32cc96a5162e0180.tar puppet-8206fad9e8545d2d3d984a4b32cc96a5162e0180.tar.gz puppet-8206fad9e8545d2d3d984a4b32cc96a5162e0180.tar.bz2 puppet-8206fad9e8545d2d3d984a4b32cc96a5162e0180.tar.xz puppet-8206fad9e8545d2d3d984a4b32cc96a5162e0180.zip | |
Build %dist based on other macros
This means temporary src.rpm generated on the
main build node will have correct suffix.
| -rw-r--r-- | modules/buildsystem/templates/mgarepo.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/buildsystem/templates/mgarepo.conf b/modules/buildsystem/templates/mgarepo.conf index 49433465..fbe5109c 100644 --- a/modules/buildsystem/templates/mgarepo.conf +++ b/modules/buildsystem/templates/mgarepo.conf @@ -55,6 +55,7 @@ rpm-macros = global <%= d %> [macros global] # mkrel definition to be removed when rpm-setup is updated on main build node mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release} +dist = %{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release} <%- distros.keys.sort.each{|d| |