From faf2a81b00c00aaac8e2ad3dcf35d63a52312ee1 Mon Sep 17 00:00:00 2001
From: Davide Madrisan <davide.madrisan@gmail.com>
Date: Sun, 29 Mar 2015 18:40:01 +0200
Subject: [PATCH] libspec.lib - Accept the rpm token %global which defines
 macros in global context

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
---
 ChangeLog          | 9 +++++++++
 NEWS               | 6 ++++++
 lib/libspec.lib.in | 4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4771ead..75cc29d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Changes in version 1.16.6
+--- -- -- 2015 Madrisan <davide.madrisan(a)gmail.com>
+
++ improvement
+  * lib/libspec.lib - Davide Madrisan
+    Accept the rpm token %global which defines macros in global context.
+
+-------------------------------------------------------------------------------
+
 Changes in version 1.16.5 - "End-of-year" release
 Tue Dec 30 2014 Madrisan <davide.madrisan(a)gmail.com>
 
diff --git a/NEWS b/NEWS
index ba97d10..3e4f51a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+List of user visible changes in the release 1.16.6
+
+-- 
+
+-------------------------------------------------------------------------------
+
 List of user visible changes in the release 1.16.5 - "End-of-year" release
 
 -- Improvement
diff --git a/lib/libspec.lib.in b/lib/libspec.lib.in
index 9769dfd..5866c04 100644
--- a/lib/libspec.lib.in
+++ b/lib/libspec.lib.in
@@ -294,7 +294,7 @@ $FUNCNAME: conditional block (%end) [level#$ifexpr_level]"
          %end)
             notify.warning $"\`%end' found; should perhaps be \`%endif'"
          ;;
-         %define)
+         "%define"|"%global")
             # note: we want to catch %define directives put in conditional blocks
             # example: %define majversion <single_token>
             let "level = 0"
@@ -319,8 +319,8 @@ $FUNCNAME: conditional block (%end) [level#$ifexpr_level]"
             case "${tok[*]}" in
             %\(*\))
                # it's something like:
-               # %define major_ver %(echo %version | cut -d. -f 1-2)
                # %define glibver %(echo `rpm -q --queryformat '%{VERSION}' libglib`)
+               # %global major_ver %(echo %version | cut -d. -f 1-2)
 
 #              rpmvar_value[${#rpmvar_value[*]}]="\
 #$( echo "${tok[*]}" | sed "s|%(\(.*\))|\1|" )"