From 3b83b83a500d27f328045fe324b7195cb24964baa2cc7595b0ece5eb45e0b1b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= <mimi.vx@gmail.com>
Date: Fri, 5 Nov 2021 17:52:17 +0000
Subject: [PATCH] - Updated to version 8.2.3582, fixes the following problems  
 * Overflow check fails with 32 ints.   * Manipulating highlighting is
 complicated.   * CI sometimes fails for MinGW.   * gj does not move properly
 with a wide character.   * Reading character past end of line.   * Reading
 uninitialized memory when giving spell suggestions. - add obsolete/conflict
 with nginx vim plugin

OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=691
---
 vim-8.2.3577.tar.gz |  3 ---
 vim-8.2.3582.tar.gz |  3 +++
 vim.changes         | 12 ++++++++++++
 vim.spec            |  8 ++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)
 delete mode 100644 vim-8.2.3577.tar.gz
 create mode 100644 vim-8.2.3582.tar.gz

diff --git a/vim-8.2.3577.tar.gz b/vim-8.2.3577.tar.gz
deleted file mode 100644
index a2c8784..0000000
--- a/vim-8.2.3577.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9544ad47bdc18bedcc0da2d4f57b58573276eb7d3480cb040051348f979e2346
-size 15773780
diff --git a/vim-8.2.3582.tar.gz b/vim-8.2.3582.tar.gz
new file mode 100644
index 0000000..e9d3feb
--- /dev/null
+++ b/vim-8.2.3582.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:363a90e45eb93c73340a711223c7ce5e564432f9eb34624e1a545f4fd57dd49d
+size 15778667
diff --git a/vim.changes b/vim.changes
index 326788b..a2d0e53 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Nov  5 17:51:31 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
+
+- Updated to version 8.2.3582, fixes the following problems
+  * Overflow check fails with 32 ints.
+  * Manipulating highlighting is complicated.
+  * CI sometimes fails for MinGW.
+  * gj does not move properly with a wide character.
+  * Reading character past end of line.
+  * Reading uninitialized memory when giving spell suggestions.
+- add obsolete/conflict with nginx vim plugin 
+
 -------------------------------------------------------------------
 Wed Nov  3 17:31:20 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
 
diff --git a/vim.spec b/vim.spec
index 8dd4981..0ac0d6b 100644
--- a/vim.spec
+++ b/vim.spec
@@ -17,7 +17,7 @@
 
 
 %define pkg_version 8.2
-%define patchlevel 3577
+%define patchlevel 3582
 %define patchlevel_compact %{patchlevel}
 %define VIM_SUBDIR vim82
 %define site_runtimepath %{_datadir}/vim/site
@@ -127,11 +127,15 @@ file name completion, block operations, and editing of binary data.
 
 %package data
 Summary:        Data files needed for extended vim functionality
-# Used to be in vim-plugins package
 Group:          Productivity/Text/Editors
 Requires:       vim-data-common = %{version}-%{release}
+# Used to be in vim-plugins package
 Obsoletes:      vim-plugin-matchit <= 1.13.2
 Provides:       vim-plugin-matchit = 1.13.2
+# conflicts with nginx own plugin
+Obsoletes:      vim-plugin-nginx < %{version}
+Provides:       vim-plugin-nginx = %{version}
+
 BuildArch:      noarch
 
 %description data