- patchlevel 956

This commit is contained in:
Zdenek Dohnal 2019-02-20 10:25:15 +01:00
parent ab054cef25
commit fe1b6ecab8
4 changed files with 7 additions and 20 deletions

1
.gitignore vendored
View File

@ -246,3 +246,4 @@
/vim-8.1-880.tar.bz2
/vim-8.1-897.tar.bz2
/vim-8.1-918.tar.bz2
/vim-8.1-956.tar.bz2

View File

@ -1 +1 @@
SHA512 (vim-8.1-918.tar.bz2) = 58fc2a3e8200721b93b10d3e3bc65cfdc4dcbcb0fe836c42c57058706d279ba638abf2a501dc12988738e2eff3348363f52596c1e3ef3727b8360895aca7f550
SHA512 (vim-8.1-956.tar.bz2) = a32efd344295e1d68559693d9f53710bc77a2d8a6f19dc969cda588f7924d854f91dc4e4c35332e954c51daa2563a46ad3081a7a236bdf03a8b2b6a777a01d77

View File

@ -1,15 +0,0 @@
diff -up vim74_new/runtime/syntax/spec.vim.1151450 vim74_new/runtime/syntax/spec.vim
--- vim74_new/runtime/syntax/spec.vim.1151450 2014-10-13 10:45:07.570944538 +0200
+++ vim74_new/runtime/syntax/spec.vim 2014-10-13 10:44:09.046945965 +0200
@@ -88,9 +88,9 @@ syn region specSectionMacroBracketArea o
"%% Files Section %%
"TODO %config valid parameters: missingok\|noreplace
"TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\)
-syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
+syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
"tip: remember to include new itens in specFilesArea above
-syn match specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\)\>'
+syn match specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|verify\|ghost\|license\)\>'
"valid options for certain section headers
syn match specDescriptionOpts contained '\s-[ln]\s*\a'ms=s+1,me=e-1

View File

@ -1,4 +1,4 @@
%define patchlevel 918
%define patchlevel 956
%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
@ -57,7 +57,6 @@ Patch3008: vim-7.4-syncolor.patch
Patch3009: vim-7.0-specedit.patch
Patch3010: vim-7.3-manpage-typo-668894-675480.patch
Patch3011: vim-manpagefixes-948566.patch
Patch3012: vim-7.4-licensemacro-1151450.patch
Patch3013: vim-7.4-globalsyntax.patch
Patch3014: vim-7.4-releasestring-1318991.patch
Patch3016: vim-8.0-copy-paste.patch
@ -246,7 +245,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
#patch3009 -p1
%patch3010 -p1
%patch3011 -p1
%patch3012 -p1
%patch3013 -p1
%patch3014 -p1
%patch3016 -p1
@ -796,6 +794,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%{_datadir}/icons/locolor/*/apps/*
%changelog
* Wed Feb 20 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.956-1
- patchlevel 956
* Wed Feb 20 2019 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.918-2
- we have Fedora 30 branch now, enable updates for it in vim-update.sh