diff --git a/nginx-vim-syntax.patch b/nginx-vim-syntax.patch deleted file mode 100644 index dada676..0000000 --- a/nginx-vim-syntax.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nur nginx-1.21.4/contrib/vim/syntax/nginx.vim new/contrib/vim/syntax/nginx.vim ---- nginx-1.21.4/contrib/vim/syntax/nginx.vim 2021-11-02 15:49:22.000000000 +0100 -+++ new/contrib/vim/syntax/nginx.vim 2021-11-08 09:58:58.283999487 +0100 -@@ -5,6 +5,10 @@ - finish - end - -+" Reset compatible-options to Vim default value, just in case: -+let s:save_cpo = &cpo -+set cpo&vim -+ - " general syntax - - if has("patch-7.4.1142") -@@ -2447,4 +2451,8 @@ - hi def link ngxListenOptions Keyword - hi def link ngxListenOptionsDeprecated Error - -+" Restore current compatible-options: -+let &cpo = s:save_cpo -+unlet s:save_cpo -+ - let b:current_syntax = "nginx" diff --git a/nginx.changes b/nginx.changes index 5f7403c..1f36cb3 100644 --- a/nginx.changes +++ b/nginx.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Mon Nov 8 08:56:05 UTC 2021 - Ferdinand Thiessen - -- Add nginx-vim-syntax.patch - * Fix the vim syntax file to work with vim 8, boo#1187888 - https://trac.nginx.org/nginx/ticket/2276 - ------------------------------------------------------------------- Fri Nov 5 21:24:19 UTC 2021 - Илья Индиго diff --git a/nginx.spec b/nginx.spec index 86ca86e..cd5086d 100644 --- a/nginx.spec +++ b/nginx.spec @@ -47,8 +47,6 @@ Patch2: nginx-1.2.4-perl_vendor_install.patch Patch3: nginx-1.6.1-default_config.patch # PATCH-FIX-UPSTREAM nginx-aio.patch fix support for Linux AIO Patch4: nginx-aio.patch -# PATCH-FIX-UPSTREAM nginx-vim-syntax.patch fix vim syntax file for vim 8 -Patch5: nginx-vim-syntax.patch BuildRequires: gcc-c++ BuildRequires: gd-devel BuildRequires: libatomic-ops-devel @@ -107,7 +105,6 @@ The source of nginx [engine x] HTTP server and IMAP/POP3 proxy server. %patch2 %patch3 %patch4 -p1 -%patch5 -p1 perl -pi -e 's|\r\n|\n|g' contrib/geo2nginx.pl # we just use lib here because nginx loads them relative to _prefix