- 1.122: recognize %global and %unglobal

diff --git a/spec.vim b/spec.vim
index e1492ecde0f5ec7b0366f87959eda174e8b900b2..fc1888f595c98c6f9e755a2a3742b2776c927faa 100644 (file)
--- a/spec.vim
+++ b/spec.vim
@@ -2,9 +2,9 @@
 " Purpose:     Vim syntax file
 " Language:    SPEC: Build/install scripts for PLD Linux RPM packages
 " Maintainer:  PLD Linux <feedback@pld-linux.org>
-" URL:        http://www.pld-linux.org/
-" Last Change: $Date$ (UTC)
-" Version:     $Revision$
+" URL:        http://git.pld-linux.org/packages/vim-syntax-spec/
+" Last Change: 2012-11-08
+" Version:     1.122
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -155,7 +155,7 @@ syn keyword specMacroNameLocal contained java_home jar java javac javadoc
 
 " One line macros - valid in all ScriptAreas
 " tip: remember do include new items on specScriptArea's skip section
-syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%\(\(un\)\?define\|dump\|trace\|patch\d*\|setup\|configure2_13\|configure\|GNUconfigure\|find_lang\|makeinstall\|cmake\|scons\|waf\|bcond_with\(out\)\?\|include\)\>' end='$' contains=specCommandOpts,specMacroIdentifier,specSectionMacroBcondArea
+syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%\(\(un\)\?\(define\|global\)\|dump\|trace\|patch\d*\|setup\|configure2_13\|configure\|GNUconfigure\|find_lang\|makeinstall\|cmake\|scons\|waf\|bcond_with\(out\)\?\|include\)\>' end='$' contains=specCommandOpts,specMacroIdentifier,specSectionMacroBcondArea
 syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro start='^%{\(configure2_13\|configure\|GNUconfigure\|find_lang\|makeinstall\|cmake\|scons\|waf\)}' end='$' contains=specCommandOpts,specMacroIdentifier
 syn region specSectionMacroBcondArea oneline matchgroup=specBlock start='%{!\??\(with\(out\)\?_[a-zA-Z0-9_]\+\|debug\):' skip='\\}' end='}' contains=ALLBUT,@specLimitedVisibility
 
@@ -210,7 +210,7 @@ syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e
 " %% Scripts Section %%
 syn region specScriptArea matchgroup=specSection
        \ start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|triggerprein\|triggerin\|triggerun\|triggerpostun\|pretrans\|posttrans\|verifyscript\|check\)\>'
-       \ skip='^%{\|^%\(define\|patch\d*\|configure2_13\|configure\|ant\|GNUconfigure\|setup\|find_lang\|makeinstall\|cmake\|scons\|waf\|useradd\|groupadd\|addusertogroup\|banner\|service\|env_update\|py_o\?comp\|py_postclean\|py_lint\|\(openldap_schema\|webapp\)_\(un\)\?register\|depmod\|pear_package_\(setup\|install\)\|\(build\|install\)_kernel_modules\|php_webserver_restart\|php4_webserver_restart\|update_browser_plugins\|gconf_schema_\(un\)?install\|glib_compile_schemas\|scrollkeeper_update_post\(un\)?\|update_icon_cache\|update_mime_database\|undos\|nagios_nrpe\|cacti_import_template\)\>'
+       \ skip='^%{\|^%\(\(un\)\?\(define\|global\)\|patch\d*\|configure2_13\|configure\|ant\|GNUconfigure\|setup\|find_lang\|makeinstall\|cmake\|scons\|waf\|useradd\|groupadd\|addusertogroup\|banner\|service\|env_update\|py_o\?comp\|py_postclean\|py_lint\|\(openldap_schema\|webapp\)_\(un\)\?register\|depmod\|pear_package_\(setup\|install\)\|\(build\|install\)_kernel_modules\|php_webserver_restart\|php4_webserver_restart\|update_browser_plugins\|gconf_schema_\(un\)?install\|glib_compile_schemas\|scrollkeeper_update_post\(un\)?\|update_icon_cache\|update_mime_database\|undos\|nagios_nrpe\|cacti_import_template\)\>'
        \ end='^%'me=e-1
        \ contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2,specSectionMacroBcondArea
 " XXX don't forget to update specMacro when updating specScriptArea skip definition

diff --git a/vim-syntax-spec.spec b/vim-syntax-spec.spec
index c2197822b5cfa83160ec067ae16eac5452ae1c27..af2ca25541a563d76b6d17f48c5148a359532777 100644 (file)
--- a/vim-syntax-spec.spec
+++ b/vim-syntax-spec.spec
@@ -1,7 +1,7 @@
 Summary:       Vim syntax: RPM specfiles
 Summary(pl.UTF-8):     Składania dla Vima: pliki RPM spec
 Name:          vim-syntax-spec
-Version:       1.121
+Version:       1.122
 Release:       1
 License:       Charityware
 Group:         Applications/Editors/Vim
@@ -28,7 +28,7 @@ Ta wtyczka zapewnia podświetlanie składni plików RPM spec.
 
 %prep
 %setup -qcT
-rev=$(awk '/^".*Version:.*Revision:/{print $4}' %{SOURCE0})
+rev=$(awk '/^".*Version:.*/{print $3}' %{SOURCE0})
 if [ "$rev" != "%{version}" ]; then
        : Update version $rev, and retry
        exit 1