OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 07-Oct-2003 11:16:47
Branch: HEAD Handle: 2003100710164501
Added files:
openpkg-src/vim vim.patch
Modified files:
openpkg-src/vim vim.spec
openpkg-web news.txt
Log:
teach Vim about %option and %if
Summary:
Revision Changes Path
1.2 +41 -0 openpkg-src/vim/vim.patch
1.242 +3 -1 openpkg-src/vim/vim.spec
1.6895 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vim/vim.patch
============================================================================
$ cvs diff -u -r0 -r1.2 vim.patch
--- /dev/null 2003-10-07 11:16:46.000000000 +0200
+++ vim.patch 2003-10-07 11:16:46.000000000 +0200
@@ -0,0 +1,41 @@
+The following patch adjust the RPM .spec syntax highlighting
+a little bit to better highlight OpenPKG RPM .spec files.
+
+--- vim62/runtime/syntax/spec.vim.orig Tue Oct 7 10:49:40 2003
++++ vim62/runtime/syntax/spec.vim Tue Oct 7 11:08:22 2003
+@@ -83,7 +83,7 @@
+
+ "One line macros - valid in all ScriptAreas
+ "tip: remember do include new itens on specScriptArea's skip section
+-syn region specSectionMacroArea oneline matchgroup=specSectionMacro
start='^%\(define\|patch\d*\|setup\|configure\|GNUconfigure\|find_lang\|makeinstall\)\>'
end='$' contains=specCommandOpts,specMacroIdentifier
++syn region specSectionMacroArea oneline matchgroup=specSectionMacro
start='^%\(option\|define\|patch\d*\|setup\|configure\|GNUconfigure\|find_lang\|makeinstall\)\>'
end='$' contains=specCommandOpts,specMacroIdentifier
+ syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro
start='^%{\(configure\|GNUconfigure\|find_lang\|makeinstall\)}' end='$'
contains=specCommandOpts,specMacroIdentifier
+
+ "%% Files Section %%
+@@ -114,7 +114,7 @@
+ syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1
contains=specPackageOpts,specPreAmble,specComment
+
+ "%% Scripts Section %%
+-syn region specScriptArea matchgroup=specSection
start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\)\>'
skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>'
end='^%'me=e-1
contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
++syn region specScriptArea matchgroup=specSection
start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\)\>'
skip='^%{\|^%\(option\|define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>'
end='^%'me=e-1
contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+
+ "%% Changelog Section %%
+ syn region specChangelogArea matchgroup=specSection start='^%changelog'
end='^%'me=e-1
contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
+@@ -137,7 +137,7 @@
+ syn match shOperator contained '[><|!&;]\|[!=]='
+ syn region shDo transparent matchgroup=specBlock start="\<do\>" end="\<done\>"
contains=ALLBUT,shFunction,shDoError,shCase,specPreAmble,@specListedFiles
+
+-syn region specIf matchgroup=specBlock
start="%ifosf\|%ifos\|%ifnos\|%ifarch\|%ifnarch\|%else" end='%endif'
contains=ALLBUT, specIfError, shCase
++syn region specIf matchgroup=specBlock
start="%if\|%ifosf\|%ifos\|%ifnos\|%ifarch\|%ifnarch\|%else" end='%endif'
contains=ALLBUT, specIfError, shCase
+
+ syn region shIf transparent matchgroup=specBlock start="\<if\>" end="\<fi\>"
contains=ALLBUT,shFunction,shIfError,shCase,@specListedFiles
+
+@@ -151,7 +151,7 @@
+ syn sync match shDoSync groupthere shDo "\<done\>"
+ syn sync match shIfSync grouphere shIf "\<if\>"
+ syn sync match shIfSync groupthere shIf "\<fi\>"
+-syn sync match specIfSync grouphere specIf "%ifarch\|%ifos\|%ifnos"
++syn sync match specIfSync grouphere specIf "%if\|%ifarch\|%ifos\|%ifnos"
+ syn sync match specIfSync groupthere specIf "%endIf"
+ syn sync match shForSync grouphere shFor "\<for\>"
+ syn sync match shForSync groupthere shFor "\<in\>"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vim/vim.spec
============================================================================
$ cvs diff -u -r1.241 -r1.242 vim.spec
--- openpkg-src/vim/vim.spec 6 Oct 2003 17:41:09 -0000 1.241
+++ openpkg-src/vim/vim.spec 7 Oct 2003 09:16:46 -0000 1.242
@@ -38,7 +38,7 @@
Group: Editor
License: Charityware
Version: %{V_vl}.%{V_pl}
-Release: 20031006
+Release: 20031007
# package options
%option with_x11 no
@@ -53,6 +53,7 @@
Source2: ftp://ftp.vim.org/pub/vim/unix/vim-%{V_vl}-rt1.tar.gz
Source3: ftp://ftp.vim.org/pub/vim/unix/vim-%{V_vl}-rt2.tar.gz
Source4: rc.vim
+Patch0: vim.patch
Patch1: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.001
Patch2: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.002
Patch3: ftp://ftp.vim.org/pub/vim/patches/%{V_vl}.003
@@ -195,6 +196,7 @@
%setup1 -q -T -D -a 1
%setup2 -q -T -D -a 2
%setup3 -q -T -D -a 3
+ %patch0 -p0
# apply initial jumbo patches
# %{l_gzip} -d -c $RPM_SOURCE_DIR/%{V_vl}.1-100.gz |\
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6894 -r1.6895 news.txt
--- openpkg-web/news.txt 7 Oct 2003 08:29:27 -0000 1.6894
+++ openpkg-web/news.txt 7 Oct 2003 09:16:45 -0000 1.6895
@@ -1,3 +1,4 @@
+07-Oct-2003: Upgraded package: P<vim-6.2.106-20031007>
07-Oct-2003: Upgraded package: P<xinetd-2.3.12-20031007>
07-Oct-2003: New package: P<xinetd-2.3.12-20031007>
07-Oct-2003: Upgraded package: P<rt-3.0.6-20031007>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
