diff options
| author | Neal Gompa <ngompa13@gmail.com> | 2015-11-07 06:51:25 -0500 |
|---|---|---|
| committer | Neal Gompa <ngompa13@gmail.com> | 2015-11-07 07:01:02 -0500 |
| commit | d396ea35d9d445fab46a9dcbad7c14b59b005095 (patch) | |
| tree | e60a21657115f5ddd4178e6c223d953c66ac9831 | |
| parent | a2bce648b0659930f4c460558bb19d54678211af (diff) | |
| download | rpm-setup-d396ea35d9d445fab46a9dcbad7c14b59b005095.tar rpm-setup-d396ea35d9d445fab46a9dcbad7c14b59b005095.tar.gz rpm-setup-d396ea35d9d445fab46a9dcbad7c14b59b005095.tar.bz2 rpm-setup-d396ea35d9d445fab46a9dcbad7c14b59b005095.tar.xz rpm-setup-d396ea35d9d445fab46a9dcbad7c14b59b005095.zip | |
Split dist tag generation logic out of %mkrel
The logic used to define the distribution tag has
been part of %mkrel for quite a while.
However, it is useful to have it split out so that
%mkrel can be reconfigured by tools that do overrides
to %dist or use %dist if it is already defined elsewhere.
| -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. |