Attachment 7123 Details for Bug 16962 – %mkrel restructure patch (git formatted)

[patch] %mkrel restructure patch (git formatted)

rpm-setup-0001-split-dist-tag-gen-logic-out-of-mkrel.patch (text/plain), 1.39 KB, created by Neal Gompa on 2015-10-14 11:37:07 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Neal Gompa

Created: 2015-10-14 11:37:07 CEST

Size: 1.39 KB

patch

obsolete

>From 915eed8db83ef0cc1e19a492dfcf061935f96c3e Mon Sep 17 00:00:00 2001
>From: Neal Gompa <ngompa13@gmail.com>
>Date: Tue, 13 Oct 2015 02:23:22 -0400
>Subject: [PATCH] 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.
>---
> build.macros.in | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/build.macros.in b/build.macros.in
>index fd585d6..f1e2b81 100644
>--- a/build.macros.in
>+++ b/build.macros.in
>@@ -136,8 +136,10 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} -
> 
> %distsuffix @DISTSUFFIX@
> 
>+%distident %{?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:%distident}%([ "%{__distro_section}" != "core" ] && echo .%__distro_section)
> 
> # Include minimal debug information in build binaries.
> # Requires _enable_debug_packages.
>-- 
>2.6.1
>

From 915eed8db83ef0cc1e19a492dfcf061935f96c3e Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Tue, 13 Oct 2015 02:23:22 -0400
Subject: [PATCH] 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.
---
 build.macros.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.macros.in b/build.macros.in
index fd585d6..f1e2b81 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -136,8 +136,10 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} -
 
 %distsuffix @DISTSUFFIX@
 
+%distident %{?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:%distident}%([ "%{__distro_section}" != "core" ] && echo .%__distro_section)
 
 # Include minimal debug information in build binaries.
 # Requires _enable_debug_packages.
-- 
2.6.1

Actions: View | Diff

Attachments on bug 16962: 7123 | 7167