Sync from SUSE:ALP:Source:Standard:1.0 vim revision b3fa0f88dee2a83f544ec64688f1c058

vim-7.3-filetype_ftl.patch

@@ -1,19 +1,7 @@
-Index: vim-8.2.2411/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
-+
-+" FreeMarker templates
-+au BufNewFile,BufRead *.ftl     setf ftl
-+
-Index: vim-8.2.2411/runtime/syntax/ftl.vim
+Index: vim-9.1.0836/runtime/syntax/ftl.vim
 ===================================================================
 --- /dev/null
-+++ vim-8.2.2411/runtime/syntax/ftl.vim
++++ vim-9.1.0836/runtime/syntax/ftl.vim
 @@ -0,0 +1,36 @@
 +" Vim syntax file
 +" Language:	FreeMarker Template Language (FTL)

vim-7.3-filetype_spec.patch

@@ -1,8 +1,8 @@
-Index: vim-8.2.2411/runtime/filetype.vim
+Index: vim-9.1.0836/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.0836.orig/runtime/filetype.vim
++++ vim-9.1.0836/runtime/filetype.vim
+@@ -2358,7 +2358,7 @@ au BufRead,BufNewFile *.sol			setf solid
  au BufNewFile,BufRead *.rq,*.sparql		setf sparql
  
  " Spec (Linux RPM)
@@ -11,16 +11,3 @@ 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
-===================================================================
---- vim-8.2.2411.orig/runtime/syntax/spec.vim
-+++ vim-8.2.2411/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
- 
- "%% Description Section %%
- syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment

vim-7.3-help_tags.patch

@@ -1,12 +0,0 @@
-Index: vim-8.2.2411/runtime/doc/Makefile
-===================================================================
---- vim-8.2.2411.orig/runtime/doc/Makefile
-+++ vim-8.2.2411/runtime/doc/Makefile
-@@ -331,6 +331,7 @@ CONVERTED = \
- all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
- 
- # Use Vim to generate the tags file.  Can only be used when Vim has been
-+	export VIMRUNTIME=../; \
- # compiled and installed.  Supports multiple languages.
- vimtags: $(DOCS)
- 	@$(VIMEXE) --clean -esX -V1 -u doctags.vim

vim-7.3-mktemp_tutor.patch

@@ -1,14 +0,0 @@
-Index: vim-8.2.2411/src/vimtutor
-===================================================================
---- vim-8.2.2411.orig/src/vimtutor
-+++ vim-8.2.2411/src/vimtutor
-@@ -24,8 +24,7 @@ xx=$1
- export xx
- 
- # We need a temp file for the copy.  First try using a standard command.
--tmp="${TMPDIR-/tmp}"
--TUTORCOPY=`mktemp $tmp/tutorXXXXXX || tempfile -p tutor || echo none`
-+TUTORCOPY=`mktemp /tmp/tutorXXXXXX || echo /tmp/tutor$$`
- 
- # If the standard commands failed then create a directory to put the copy in.
- # That is a secure way to make a temp file.

vim-7.4-highlight_fstab.patch

@@ -1,13 +0,0 @@
-Index: vim-9.0.1188/runtime/syntax/fstab.vim
-===================================================================
---- vim-9.0.1188.orig/runtime/syntax/fstab.vim
-+++ vim-9.0.1188/runtime/syntax/fstab.vim
-@@ -35,7 +35,7 @@ syn match fsOperator /[,=:#]/
- " Device
- syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
- syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
--syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts devtmpfs sysfs usbfs
-+syn keyword fsDeviceKeyword contained none proc linproc tmpfs debugfs devpts devtmpfs sysfs usbfs
- syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
- syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
- syn keyword fsDeviceKeyword contained PARTLABEL nextgroup=fsDevicePARTLABEL

vim.spec

@@ -17,7 +17,7 @@
 
 
 %define pkg_version 9.1
-%define patchlevel 0111
+%define patchlevel 1101
 %define patchlevel_compact %{patchlevel}
 %define VIM_SUBDIR vim91
 %define site_runtimepath %{_datadir}/vim/site
@@ -63,13 +63,10 @@ Source98:       vim-changelog.sh
 Source99:       %{name}-7.4-rpmlintrc
 Patch3:         %{name}-7.4-disable_lang_no.patch
 Patch4:         %{name}-7.3-gvimrc_fontset.patch
-Patch5:         %{name}-7.4-highlight_fstab.patch
 Patch6:         %{name}-7.3-sh_is_bash.patch
 Patch7:         %{name}-7.3-filetype_ftl.patch
-Patch8:         %{name}-7.3-help_tags.patch
 Patch9:         %{name}-7.3-use_awk.patch
 Patch10:        %{name}-7.3-name_vimrc.patch
-Patch11:        %{name}-7.3-mktemp_tutor.patch
 Patch15:        %{name}-7.4-filetype_apparmor.patch
 Patch18:        %{name}-7.3-filetype_spec.patch
 Patch21:        %{name}-7.3-filetype_changes.patch
@@ -213,13 +210,10 @@ a hex dump back to its original binary form.
 
 %patch -P 3 -p1
 %patch -P 4 -p1
-%patch -P 5 -p1
 %patch -P 6 -p1
 %patch -P 7 -p1
-%patch -P 8 -p1
 %patch -P 9 -p1
 %patch -P 10 -p1
-%patch -P 11 -p1
 cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch -P 15 -p1
 %patch -P 18 -p1
@@ -419,6 +413,10 @@ install -D -m 0644 \
     vimrc_example1 vimrc_example2 suse.vimrc \
     README.txt READMEdir/README_src.txt READMEdir/README_unix.txt \
   %{buildroot}%{_docdir}/vim/
+
+rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/LICENSE
+rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/README.txt
+
 # gvim
 install -D -m 0644 \
     README.Japanese-XIM runtime/gvimrc_example.vim suse.gvimrc \