Author: glen Date: Sun Jun 19 22:08:46 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- cosmetics
---- Files affected:
SOURCES:
spec.vim (1.20 -> 1.21)
---- Diffs:
================================================================
Index: SOURCES/spec.vim
diff -u SOURCES/spec.vim:1.20 SOURCES/spec.vim:1.21
--- SOURCES/spec.vim:1.20 Tue Jun 14 10:48:20 2005
+++ SOURCES/spec.vim Mon Jun 20 00:08:41 2005
@@ -35,24 +35,24 @@
syn case match
-"matches with no highlight
+" matches with no highlight
syn match specNoNumberHilite 'X11\|X11R6\|[a-zA-Z]*\.\d\|[a-zA-Z][-/]\d'
syn match specManpageFile '[a-zA-Z]\.1'
-"Day, Month and most used license acronyms
+" Day, Month and most used license acronyms
syn keyword specLicense contained GPL LGPL BSD MIT GNU
syn keyword specWeekday contained Mon Tue Wed Thu Fri Sat Sun
syn keyword specMonth contained Jan Feb Mar Apr Jun Jul Aug Sep Oct Nov Dec
syn keyword specMonth contained January February March April May June July
August September October November December
-"#, @, www
+" #, @, www
syn match specNumber '\(^-\=\|[ \t]-\=\|-\)[0-9.-]*[0-9]'
syn match specEmail contained "<\=\<[EMAIL
PROTECTED]([A-Za-z0-9_-]\+\.\)\+[A-Za-z]\+\>>\="
syn match specURL contained
'\<\(\(https\{0,1}\|ftp\)://\|\(www[23]\{0,1}\.\|ftp\.\)\)[A-Za-z0-9._/~:,#?=-]\+\>'
syn match specURLMacro contained
'\<\(\(https\{0,1}\|ftp\)://\|\(www[23]\{0,1}\.\|ftp\.\)\)[A-Za-z0-9._/~:,#%{}-]\+\>'
contains=specMacroIdentifier
-"TODO take specSpecialVariables out of the cluster for the sh* contains
(ALLBUT)
-"Special system directories
+" TODO take specSpecialVariables out of the cluster for the sh* contains
(ALLBUT)
+" Special system directories
syn match specListedFilesPrefix contained
'/\(usr\|local\|opt\|X11R6\|X11\)/'me=e-1
syn match specListedFilesBin contained '/s\=bin/'me=e-1
syn match specListedFilesLib contained '/\(lib\|include\)/'me=e-1
@@ -61,7 +61,7 @@
syn match specListedFilesShare contained '/share/'me=e-1
syn cluster specListedFiles
contains=specListedFilesBin,specListedFilesLib,specListedFilesDoc,specListedFilesEtc,specListedFilesShare,specListedFilesPrefix,specVariables,specSpecialChar
-"specComands
+" specComands
syn match specConfigure contained '\./configure'
syn match specTarCommand contained '\<tar\s\+[cxvpzjf]\{,5}\s*'
syn match specMacro contained
'%\(\(group\|user\)\(add\|remove\)\|banner\|addusertogroup\|apache_config_\(un\)\?install\|depmod\)'
@@ -69,36 +69,51 @@
syn keyword specCommand contained make xmkmf mkdir chmod find
sed rm strip moc echo grep ls rm mv mkdir chown install cp pwd cat tail then
else elif cd gzip rmdir ln eval export touch unzip bzip2
syn cluster specCommands
contains=specCommand,specTarCommand,specConfigure,specCommandSpecial,specMacro
-"frequently used rpm env vars
+" frequently used rpm env vars
syn keyword specSpecialVariablesNames contained RPM_BUILD_ROOT RPM_BUILD_DIR
RPM_SOURCE_DIR RPM_OPT_FLAGS LDFLAGS CC CC_FLAGS CPPNAME CFLAGS CXX CXXFLAGS
CPPFLAGS
-"valid macro names from /usr/lib/rpm/macros
-syn keyword specMacroNameOther contained buildroot buildsubdir debugcflags
debuginfocflags date distribution disturl ix86 kgcc kgcc_package name nil
optflags packager perl_archlib perl_privlib perl_sitearch perl_sitelib
perl_vendorarch perl_vendorlib py_sitedir py_sitescriptdir release requires_eq
rpmcflags rpmcxxflags rpmldflags tmpdir vendor version epoch
+" valid macro names from /usr/lib/rpm/macros
+syn keyword specMacroNameOther contained buildroot buildsubdir debugcflags
debuginfocflags date distribution disturl ix86
+syn keyword specMacroNameOther contained kgcc kgcc_package name nil optflags
packager perl_archlib perl_privlib perl_sitearch
+syn keyword specMacroNameOther contained perl_sitelib perl_vendorarch
perl_vendorlib py_sitedir py_sitescriptdir release
+syn keyword specMacroNameOther contained requires_eq rpmcflags rpmcxxflags
rpmldflags tmpdir vendor version epoch
syn match specMacroNameOther contained '\<\(PATCH\|SOURCE\)\d*\>'
-"valid _macro names from /usr/lib/rpm/macros
-syn keyword specMacroNameLocal contained _aclocaldir _applnkdir _arch
_binary_payload _bindir _build _build_arch _build_alias _build_cpu _builddir
_build_os _buildshell _buildsubdir _build_vendor _bzip2bin _datadir _dbpath
_dbpath_rebuild _defaultdocdir _desktopdir _docdir _examplesdir _excludedocs
_exec_prefix _fixgroup _fixowner _fixperms _fontsdir _ftpport _ftpproxy _gnu
_gpg_name _gpg_path _gtkdocdir _gzipbin _host _host_alias _host_cpu _host_os
_host_vendor _httpport _httpproxy _iconsdir _includedir _infodir _initrddir
_install_langs _install_script_path _instchangelog _javaclasspath _javadir
_javadocdir _kernelsrcdir _kernel_ver _kernel_ver_str _langpatt _lib _libdir
_libexecdir _localstatedir _mandir _netsharedpath _oldincludedir _omf_dest_dir
_os _package_version _pgpbin _pgp_name _pgp_path _pixmapsdir _pkgconfigdir
_prefix _preScriptEnvironment _provides _rpmdir _rpmfilename _sbindir
_sharedstatedir _signature _smp_mflags _sourcedir _source_payload _specdir
_srcrpm!
dir _sysconfdir _target _target_alias _target_cpu _target_os _target_platform
_target_vendor _target_base_arch _timecheck _tmppath _topdir _usr _usrsrc _var
_vendor
+" valid _macro names from /usr/lib/rpm/macros
+syn keyword specMacroNameLocal contained _aclocaldir _applnkdir _arch
_binary_payload _bindir _build _build_arch _build_alias
+syn keyword specMacroNameLocal contained _build_cpu _builddir _build_os
_buildshell _buildsubdir _build_vendor _bzip2bin _datadir
+syn keyword specMacroNameLocal contained _dbpath _dbpath_rebuild
_defaultdocdir _desktopdir _docdir _examplesdir _excludedocs
+syn keyword specMacroNameLocal contained _exec_prefix _fixgroup _fixowner
_fixperms _fontsdir _ftpport _ftpproxy _gnu _gpg_name
+syn keyword specMacroNameLocal contained _gpg_path _gtkdocdir _gzipbin _host
_host_alias _host_cpu _host_os _host_vendor
+syn keyword specMacroNameLocal contained _httpport _httpproxy _iconsdir
_includedir _infodir _initrddir _install_langs
+syn keyword specMacroNameLocal contained _install_script_path _instchangelog
_javaclasspath _javadir _javadocdir _kernelsrcdir
+syn keyword specMacroNameLocal contained _kernel_ver _kernel_ver_str _langpatt
_lib _libdir _libexecdir _localstatedir _mandir
+syn keyword specMacroNameLocal contained _netsharedpath _oldincludedir
_omf_dest_dir _os _package_version _pgpbin _pgp_name
+syn keyword specMacroNameLocal contained _pgp_path _pixmapsdir _pkgconfigdir
_prefix _preScriptEnvironment _provides _rpmdir
+syn keyword specMacroNameLocal contained _rpmfilename _sbindir _sharedstatedir
_signature _smp_mflags _sourcedir _source_payload
+syn keyword specMacroNameLocal contained _specdir _srcrpmdir _sysconfdir
_target _target_alias _target_cpu _target_os _target_platform
+syn keyword specMacroNameLocal contained _target_vendor _target_base_arch
_timecheck _tmppath _topdir _usr _usrsrc _var _vendor
syn keyword specMacroNameLocal contained __cxx __cc __make __perl __libtoolize
__aclocal __autoconf __automake __autoheader __gettextize __sed
-"------------------------------------------------------------------------------
+"
------------------------------------------------------------------------------
" here's is all the spec sections definitions: PreAmble, Description, Package,
" Scripts, Files and Changelog
-"One line macros - valid in all ScriptAreas
-"tip: remember do include new items on specScriptArea's skip section
+" 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\|bcond_with\(out\)\?\|include\)\>'
end='$' contains=specCommandOpts,specMacroIdentifier,specSectionMacroBcondArea
syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro
start='^%{\(configure2_13\|configure\|GNUconfigure\|find_lang\|makeinstall\)}'
end='$' contains=specCommandOpts,specMacroIdentifier
syn region specSectionMacroBcondArea oneline matchgroup=specBlock
start='%{!\??\(with\(out\)\?_[a-zA-Z0-9_]\+\|debug\):' skip='\\}' end='}'
contains=ALLBUT,shCase
-"%% Files Section %%
-"TODO %config valid parameters: missingok\|noreplace
-"TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\)
+" %% Files Section %%
+" TODO %config valid parameters: missingok\|noreplace
+" TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\)
syn region specFilesArea matchgroup=specSection
start='^%[Ff][Ii][Ll][Ee][Ss]\>'
skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|exclude\|dev\)\>'
end='^%[a-zA-Z]'me=e-2
contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
-"tip: remember to include new items in specFilesArea above
+" tip: remember to include new items in specFilesArea above
syn match specFilesDirective contained
'%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|exclude\|dev\)\>'
-"valid options for certain section headers
+" valid options for certain section headers
syn match specDescriptionOpts contained '\s-[ln]\s*\a'ms=s+1,me=e-1
syn match specPackageOpts contained '\s-n\s*\w'ms=s+1,me=e-1
syn match specFilesOpts contained '\s-f\s*\w'ms=s+1,me=e-1
@@ -107,28 +122,28 @@
syn case ignore
-"%% PreAmble Section %%
-"Copyright and Serial were deprecated by License and Epoch
+" %% PreAmble Section %%
+" Copyright and Serial were deprecated by License and Epoch
syn region specPreAmbleDeprecated oneline matchgroup=specError
start='^\(Copyright\|Serial\)' end='$'
contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
syn region specPreAmble oneline matchgroup=specCommand
\
start='\(^\|\(^%{!\??\(with\(out\)\?_[a-zA-Z0-9_]\+\|debug\):\)\@<=\)\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReqProv\|AutoReq\|AutoProv\|Epoch\|NoSource\)'
\ end='$\|[EMAIL PROTECTED]'
\
contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier,specSectionMacroBcondArea
-"%% Description Section %%
+" %% Description Section %%
syn region specDescriptionArea matchgroup=specSection start='^%description'
end='^%'me=e-1
contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
-"%% Package Section %%
+" %% Package Section %%
syn region specPackageArea matchgroup=specSection start='^%package'
end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
-"%% Scripts Section %%
+" %% Scripts Section %%
syn region specScriptArea matchgroup=specSection
\
start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\|triggerin\|triggerun\|triggerpostun\)\>'
\
skip='^%{\|^%\(define\|patch\d*\|configure2_13\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\|useradd\|groupadd\|addusertogroup\|py_comp\|py_ocomp\|apache_config_\(un\)\?install\|depmod\)\>'
\ end='^%'me=e-1
\
contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2,specSectionMacroBcondArea
-"%% Changelog Section %%
+" %% Changelog Section %%
syn region specChangelogArea matchgroup=specSection start='^%changelog'
end='^%'me=e-1
\
contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense,specRevision,specLogMessage,specLogError
@@ -136,14 +151,14 @@
syn region specLogMessage contained start="^[- ] " end="$"
contains=specLogError,specURL,specEmail
syn match specLogError contained "%%"
-"------------------------------------------------------------------------------
-"here's the shell syntax for all the Script Sections
+"
------------------------------------------------------------------------------
+" here's the shell syntax for all the Script Sections
syn case match
-"sh-like comment style, only valid in script part
+" sh-like comment style, only valid in script part
syn match shComment contained '#.*$'
syn region shQuote1 contained matchgroup=shQuoteDelim start=+'+ skip=+\\'+
end=+'+ contains=specMacroIdentifier
@@ -154,9 +169,9 @@
syn region specIf matchgroup=specBlock
start="%ifosf\|%ifos\|%ifnos\|%ifarch\|%ifnarch\|ifdef\|ifndef\|%if\|%else"
end='%endif' contains=ALLBUT, specIfError, shCase
-syn region shIf transparent matchgroup=specBlock start="\<if\>" end="\<fi\>"
contains=ALLBUT,shFunction,shIfError,shCase,@specListedFiles
+syn region shIf transparent matchgroup=specBlock start="\<if\>" end="\<fi\>"
contains=ALLBUT,shFunction,shIfError,shCase,@specListedFiles
-syn region shFor matchgroup=specBlock start="\<for\>" end="\<in\>"
contains=ALLBUT,shFunction,shInError,shCase,@specListedFiles
+syn region shFor matchgroup=specBlock start="\<for\>" end="\<in\>"
contains=ALLBUT,shFunction,shInError,shCase,@specListedFiles
syn region shCaseEsac transparent matchgroup=specBlock start="\<case\>"
matchgroup=NONE end="\<in\>"me=s-1
contains=ALLBUT,shFunction,shCaseError,@specListedFiles nextgroup=shCaseEsac
syn region shCaseEsac matchgroup=specBlock start="\<in\>" end="\<esac\>"
contains=ALLBUT,shFunction,shCaseError,@specListedFilesBin
@@ -205,7 +220,7 @@
HiLink shQuote2 String
HiLink shQuoteDelim Statement
- "spec colors
+ " spec colors
HiLink specBlock Function
HiLink specBcond Function
HiLink specColon Special
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/spec.vim?r1=1.20&r2=1.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
