From 9f0de931579c818ad06665081739f996b770809a2b0149eb3ebb694da2484ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=BB=D1=8C=D1=8F=20=D0=98=D0=BD=D0=B4=D0=B8=D0=B3?=
 =?UTF-8?q?=D0=BE?= <ilya@ilya.cf>
Date: Mon, 8 Nov 2021 10:38:48 +0000
Subject: [PATCH] Accepting request 930116 from
 home:susnux:branches:server:http

- Add nginx-vim-syntax.patch
  * Fix the vim syntax file to work with vim 8, boo#1187888
    https://trac.nginx.org/nginx/ticket/2276

OBS-URL: https://build.opensuse.org/request/show/930116
OBS-URL: https://build.opensuse.org/package/show/server:http/nginx?expand=0&rev=218
---
 nginx-vim-syntax.patch | 23 +++++++++++++++++++++++
 nginx.changes          |  7 +++++++
 nginx.spec             |  3 +++
 3 files changed, 33 insertions(+)
 create mode 100644 nginx-vim-syntax.patch

diff --git a/nginx-vim-syntax.patch b/nginx-vim-syntax.patch
new file mode 100644
index 0000000..dada676
--- /dev/null
+++ b/nginx-vim-syntax.patch
@@ -0,0 +1,23 @@
+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 1f36cb3..5f7403c 100644
--- a/nginx.changes
+++ b/nginx.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Nov  8 08:56:05 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- 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 - Илья Индиго <ilya@ilya.pp.ua>
 
diff --git a/nginx.spec b/nginx.spec
index cd5086d..86ca86e 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -47,6 +47,8 @@ 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
@@ -105,6 +107,7 @@ 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