Sync from SUSE:SLFO:Main vim revision 5914910a9e099846667ae643238ac2b8
This commit is contained in:
parent
ef00154fea
commit
584b5906b0
|
|
@ -29,7 +29,7 @@ BuildRequires:
|
|||
%description
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
|
|
@ -38,8 +38,8 @@ BuildRequires:
|
|||
%install
|
||||
%make_install
|
||||
|
||||
%post
|
||||
%postun
|
||||
%check
|
||||
%make_build check
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
|
|
|
|||
|
|
@ -1,19 +1,22 @@
|
|||
Index: vim-8.2.2411/runtime/filetype.vim
|
||||
Index: vim-9.1.0330/runtime/filetype.vim
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/runtime/filetype.vim
|
||||
+++ vim-8.2.2411/runtime/filetype.vim
|
||||
@@ -2312,3 +2312,7 @@ endfunc
|
||||
" Restore 'cpoptions'
|
||||
let &cpo = s:cpo_save
|
||||
unlet s:cpo_save
|
||||
+
|
||||
--- vim-9.1.0330.orig/runtime/filetype.vim
|
||||
+++ vim-9.1.0330/runtime/filetype.vim
|
||||
@@ -2313,6 +2313,10 @@ au BufNewFile,BufRead *.stp setf stp
|
||||
" Standard ML
|
||||
au BufNewFile,BufRead *.sml setf sml
|
||||
|
||||
+" FreeMarker templates
|
||||
+au BufNewFile,BufRead *.ftl setf ftl
|
||||
+
|
||||
Index: vim-8.2.2411/runtime/syntax/ftl.vim
|
||||
+
|
||||
" Sratus VOS command macro
|
||||
au BufNewFile,BufRead *.cm setf voscm
|
||||
|
||||
Index: vim-9.1.0330/runtime/syntax/ftl.vim
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ vim-8.2.2411/runtime/syntax/ftl.vim
|
||||
+++ vim-9.1.0330/runtime/syntax/ftl.vim
|
||||
@@ -0,0 +1,36 @@
|
||||
+" Vim syntax file
|
||||
+" Language: FreeMarker Template Language (FTL)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
Index: vim-8.2.2411/runtime/filetype.vim
|
||||
Index: vim-9.1.0151/runtime/filetype.vim
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/runtime/filetype.vim
|
||||
+++ vim-8.2.2411/runtime/filetype.vim
|
||||
@@ -1639,7 +1639,7 @@ au BufNewFile,BufRead *.rules call dis
|
||||
--- vim-9.1.0151.orig/runtime/filetype.vim
|
||||
+++ vim-9.1.0151/runtime/filetype.vim
|
||||
@@ -2122,7 +2122,7 @@ au BufRead,BufNewFile *.sol setf solid
|
||||
au BufNewFile,BufRead *.rq,*.sparql setf sparql
|
||||
|
||||
" Spec (Linux RPM)
|
||||
|
|
@ -11,16 +11,16 @@ Index: vim-8.2.2411/runtime/filetype.vim
|
|||
|
||||
" Speedup (AspenTech plant simulator)
|
||||
au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup
|
||||
Index: vim-8.2.2411/runtime/syntax/spec.vim
|
||||
Index: vim-9.1.0151/runtime/syntax/spec.vim
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/runtime/syntax/spec.vim
|
||||
+++ vim-8.2.2411/runtime/syntax/spec.vim
|
||||
--- vim-9.1.0151.orig/runtime/syntax/spec.vim
|
||||
+++ vim-9.1.0151/runtime/syntax/spec.vim
|
||||
@@ -102,7 +102,7 @@ syn case ignore
|
||||
"%% 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='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|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\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
|
||||
+syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|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\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|Recommends\|Suggests\|Freshens\|EssentialFor\|Supplements\|Enhances\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
|
||||
-syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
|
||||
+syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|SourceLicense\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|Freshens\|EssentialFor\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
|
||||
|
||||
"%% Description Section %%
|
||||
syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
|
||||
|
|
|
|||
BIN
vim-9.1.0111.tar.gz
(Stored with Git LFS)
BIN
vim-9.1.0111.tar.gz
(Stored with Git LFS)
Binary file not shown.
BIN
vim-9.1.0330.tar.gz
(Stored with Git LFS)
Normal file
BIN
vim-9.1.0330.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
12
vim.changes
12
vim.changes
|
|
@ -1,3 +1,15 @@
|
|||
-------------------------------------------------------------------
|
||||
Mon Apr 22 05:31:47 UTC 2024 - Zoltan Balogh <zbalogh@suse.com>
|
||||
|
||||
- Updated to version 9.1 with patch level 0330, fixes the following problems
|
||||
* Fixing bsc#1220763 - vim gets Segmentation fault after updating to version 9.1.0111-150500.20.9.1
|
||||
- refreshed vim-7.3-filetype_spec.patch
|
||||
- refreshed vim-7.3-filetype_ftl.patch
|
||||
- Update spec.skeleton to use autosetup in place of setup macro.
|
||||
- for the complete list of changes see
|
||||
https://github.com/vim/vim/compare/v9.1.0111...v9.1.0330
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 29 16:49:15 UTC 2024 - Zoltan Balogh <zbalogh@suse.com>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user