Commit faf2a81b00c00aaac8e2ad3dcf35d63a52312ee1
1 parent
4f100fc519
Exists in
master
libspec.lib - Accept the rpm token %global which defines macros in global context
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
Showing 3 changed files with 17 additions and 2 deletions Side-by-side Diff
ChangeLog
1 | +Changes in version 1.16.6 | |
2 | +--- -- -- 2015 Madrisan <davide.madrisan(a)gmail.com> | |
3 | + | |
4 | ++ improvement | |
5 | + * lib/libspec.lib - Davide Madrisan | |
6 | + Accept the rpm token %global which defines macros in global context. | |
7 | + | |
8 | +------------------------------------------------------------------------------- | |
9 | + | |
1 | 10 | Changes in version 1.16.5 - "End-of-year" release |
2 | 11 | Tue Dec 30 2014 Madrisan <davide.madrisan(a)gmail.com> |
3 | 12 |
lib/libspec.lib.in
... | ... | @@ -294,7 +294,7 @@ |
294 | 294 | %end) |
295 | 295 | notify.warning $"\`%end' found; should perhaps be \`%endif'" |
296 | 296 | ;; |
297 | - %define) | |
297 | + "%define"|"%global") | |
298 | 298 | # note: we want to catch %define directives put in conditional blocks |
299 | 299 | # example: %define majversion <single_token> |
300 | 300 | let "level = 0" |
301 | 301 | |
... | ... | @@ -319,8 +319,8 @@ |
319 | 319 | case "${tok[*]}" in |
320 | 320 | %\(*\)) |
321 | 321 | # it's something like: |
322 | - # %define major_ver %(echo %version | cut -d. -f 1-2) | |
323 | 322 | # %define glibver %(echo `rpm -q --queryformat '%{VERSION}' libglib`) |
323 | + # %global major_ver %(echo %version | cut -d. -f 1-2) | |
324 | 324 | |
325 | 325 | # rpmvar_value[${#rpmvar_value[*]}]="\ |
326 | 326 | #$( echo "${tok[*]}" | sed "s|%(\(.*\))|\1|" )" |