From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Mon, 16 Dec 2013 19:42:07 +0000 (-0500)
Subject: dtrace: fix conditionals for changelog composition
X-Git-Tag: v4.1.12-111.0.20170907_2225~3^2~3^2~104
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2a119d3fe679a47f441b06f037fa8e1db32b9e82;p=users%2Fjedix%2Flinux-maple.git

dtrace: fix conditionals for changelog composition

Build failure indicated that under some conditions, the changelog created in
the specfile by means of build version conditionals resulted in out-of-order
entries in the changelog.  This has been corrected.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
---

diff --git a/dtrace/dtrace-module.spec b/dtrace/dtrace-module.spec
index 189714501407e..6a034adde8d6d 100644
--- a/dtrace/dtrace-module.spec
+++ b/dtrace/dtrace-module.spec
@@ -152,9 +152,11 @@ rm -rf %{buildroot}
 - Ensure safe access to userspace stack memory location.
   [Orabug: 17591351]
 %endif
-%if %{dt_vcode} >= %{dt_0_4_0}
+%if %{dt_vcode} == %{dt_0_4_0}
 * Thu Oct 17 2013 Nick Alcock <nick.alcock@oracle.com> - 0.4.0-3 
 - fix changelog, no code changes 
+%endif
+%if %{dt_vcode} >= %{dt_0_4_0}
 * Thu Oct 10 2013 Kris Van Hees <kris.van.hees@oracle.com> - 0.4.0-2
 - Bugfix for ustack() to avoid using vma data.
 * Wed Aug  7 2013 Kris Van Hees <kris.van.hees@oracle.com> - 0.4.0-1