diff --git a/.gitignore b/.gitignore index 98e3338..3140e8a 100644 --- a/.gitignore +++ b/.gitignore @@ -255,3 +255,4 @@ /vim-8.1-1359.tar.bz2 /vim-8.1-1413.tar.bz2 /vim-8.1-1471.tar.bz2 +/vim-8.1-1517.tar.bz2 diff --git a/sources b/sources index 984bade..1eb04ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.1-1471.tar.bz2) = aa2bf83dce8124d4e7970f076b9c9a4baa68124369fe1234f21f2c1626b47ddc190265360dc6200c117f858575c48df2b3bf6009e199d054242e38e0bb414291 +SHA512 (vim-8.1-1517.tar.bz2) = 2c232cdbd8e7fee8bda75742c5e946c7a57e9f604084bb41db0b35a5c4af771f1b6e2b9a3d430833d385dbdcf055d2e7dae02ef470805e80e013ccf3d44de325 diff --git a/vim-7.4-fstabsyntax.patch b/vim-7.4-fstabsyntax.patch index f82a66c..87ddef4 100644 --- a/vim-7.4-fstabsyntax.patch +++ b/vim-7.4-fstabsyntax.patch @@ -1,6 +1,6 @@ -diff -up vim80/runtime/syntax/fstab.vim.fstabsyntax vim80/runtime/syntax/fstab.vim ---- vim80/runtime/syntax/fstab.vim.fstabsyntax 2017-11-19 20:32:49.000000000 +0100 -+++ vim80/runtime/syntax/fstab.vim 2017-11-20 16:01:31.494316342 +0100 +diff -up vim81/runtime/syntax/fstab.vim.fstabsyntax vim81/runtime/syntax/fstab.vim +--- vim81/runtime/syntax/fstab.vim.fstabsyntax 2019-06-11 09:55:23.000000000 +0200 ++++ vim81/runtime/syntax/fstab.vim 2019-06-11 10:14:22.223616868 +0200 @@ -56,7 +56,7 @@ syn keyword fsMountPointKeyword containe " Type syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown @@ -14,8 +14,8 @@ diff -up vim80/runtime/syntax/fstab.vim.fstabsyntax vim80/runtime/syntax/fstab.v syn keyword fsOptionsYesNo yes no syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck syn keyword fsOptionsSize 512 1024 2048 --syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx -+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx +-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail ++syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner pamconsole rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail syn match fsOptionsGeneral /_netdev/ " Options: adfs diff --git a/vim.spec b/vim.spec index a243609..0f684bc 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1471 +%define patchlevel 1517 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -21,7 +21,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Vim and MIT Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source1: vim.sh @@ -244,7 +244,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch3002 -p1 %patch3004 -p1 %patch3006 -p1 -%patch3007 -p1 +%patch3007 -p1 -b .fstabsyntax %patch3008 -p1 -b .syncolor #patch3009 -p1 %patch3010 -p1 @@ -790,6 +790,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_datadir}/icons/locolor/*/apps/* %changelog +* Tue Jun 11 2019 Zdenek Dohnal - 2:8.1.1517-1 +- patchlevel 1517 + * Tue Jun 11 2019 Zdenek Dohnal - 2:8.1.1471-2 - remove desktop patch, already in upstream