diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | build.macros.in | 5 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,6 @@ +- update %mkrel to use %dist when defined and + split out dist tag generation logic out of %mkrel + Version 2.15 - 23 October 2015, by Pascal Terjan - update gem_install macro diff --git a/build.macros.in b/build.macros.in index 453467f..bdd5364 100644 --- a/build.macros.in +++ b/build.macros.in @@ -136,8 +136,11 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} - %distsuffix @DISTSUFFIX@ +%__dist_ident %{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release} + %__distro_section %{?distro_section:%distro_section}%{?!distro_section:core} -%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release}%([ "%{__distro_section}" != "core" ] && echo .%__distro_section) + +%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?dist:%dist}%{?!dist:%__dist_ident}%([ "%{__distro_section}" != "core" ] && echo .%__distro_section) # Include minimal debug information in build binaries. # Requires _enable_debug_packages. |