SLFO-pool/vim
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main vim revision 5914910a9e099846667ae643238ac2b8

Browse Source
This commit is contained in:
Adrian Schröter 2024-06-30 14:24:37 +02:00
parent ef00154fea
commit 584b5906b0
7 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spec.skeleton
View File

@ -29,7 +29,7 @@ BuildRequires:
%description %description
%prep %prep
%autosetup %autosetup -p1
%build %build
%configure %configure
@ -38,8 +38,8 @@ BuildRequires:
%install %install
%make_install %make_install
%post %check
%postun %make_build check
%files %files
%license COPYING %license COPYING

23
vim-7.3-filetype_ftl.patch
View File

@ -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-9.1.0330.orig/runtime/filetype.vim
+++ vim-8.2.2411/runtime/filetype.vim +++ vim-9.1.0330/runtime/filetype.vim
@@ -2312,3 +2312,7 @@ endfunc @@ -2313,6 +2313,10 @@ au BufNewFile,BufRead *.stp setf stp
" Restore 'cpoptions' " Standard ML
let &cpo = s:cpo_save au BufNewFile,BufRead *.sml setf sml
unlet s:cpo_save
+
+" FreeMarker templates +" FreeMarker templates
+au BufNewFile,BufRead *.ftl setf ftl +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 --- /dev/null
+++ vim-8.2.2411/runtime/syntax/ftl.vim +++ vim-9.1.0330/runtime/syntax/ftl.vim
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+" Vim syntax file +" Vim syntax file
+" Language: FreeMarker Template Language (FTL) +" Language: FreeMarker Template Language (FTL)

18
vim-7.3-filetype_spec.patch
View File

@ -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-9.1.0151.orig/runtime/filetype.vim
+++ vim-8.2.2411/runtime/filetype.vim +++ vim-9.1.0151/runtime/filetype.vim
@@ -1639,7 +1639,7 @@ au BufNewFile,BufRead *.rules call dis @@ -2122,7 +2122,7 @@ au BufRead,BufNewFile *.sol setf solid
au BufNewFile,BufRead *.rq,*.sparql setf sparql au BufNewFile,BufRead *.rq,*.sparql setf sparql
" Spec (Linux RPM) " Spec (Linux RPM)
@ -11,16 +11,16 @@ Index: vim-8.2.2411/runtime/filetype.vim
" Speedup (AspenTech plant simulator) " Speedup (AspenTech plant simulator)
au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup 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-9.1.0151.orig/runtime/syntax/spec.vim
+++ vim-8.2.2411/runtime/syntax/spec.vim +++ vim-9.1.0151/runtime/syntax/spec.vim
@@ -102,7 +102,7 @@ syn case ignore @@ -102,7 +102,7 @@ syn case ignore
"%% PreAmble Section %% "%% PreAmble Section %%
"Copyright and Serial were deprecated by License and Epoch "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 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\|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\|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\|Freshens\|EssentialFor\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
"%% Description Section %% "%% Description Section %%
syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment 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)
View File

Binary file not shown.

BIN
vim-9.1.0330.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

12
vim.changes
View File

@ -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> Thu Feb 29 16:49:15 UTC 2024 - Zoltan Balogh <zbalogh@suse.com>

2
vim.spec
View File

@ -17,7 +17,7 @@
%define pkg_version 9.1 %define pkg_version 9.1
%define patchlevel 0111 %define patchlevel 0330
%define patchlevel_compact %{patchlevel} %define patchlevel_compact %{patchlevel}
%define VIM_SUBDIR vim91 %define VIM_SUBDIR vim91
%define site_runtimepath %{_datadir}/vim/site %define site_runtimepath %{_datadir}/vim/site