Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/vim.git#6f00361810d1b2b3351215ef1cc5a7184bd1b21d

.gitignore

@@ -336,3 +336,4 @@
 /vim-8.2-2086.tar.bz2
 /vim-8.2-2108.tar.bz2
 /vim-8.2-2115.tar.bz2
+/vim-8.2-2143.tar.bz2

sources

@@ -1 +1 @@
-SHA512 (vim-8.2-2115.tar.bz2) = 7fcf4a0f55b70280f8251cf1c0e46d5cbd0a4e5cb98df0f36600defffc8e0f641c23f6f88f3124fad29aa6c3f6cc7f0e3950af0403b14e1f5691203e879c1564
+SHA512 (vim-8.2-2143.tar.bz2) = 5d2445b809cc6fd0fb070a300f90866ae17d777c75df8cd8339663c9a259b30844bf91be30e976c8b1a227c21afaee11a7b8a48d7e6c4ec5ec490433c414099f

vim.spec

@@ -1,4 +1,4 @@
-%define patchlevel 2115
+%define patchlevel 2143
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -144,7 +144,7 @@ only available when the vim-common package is installed.
 %package enhanced
 Summary: A version of the VIM editor which includes recent enhancements
 # now vim-minimal ships vim.sh, vim.csh and vim.fish too, so we need to conflict
-Conflicts: vim-minimal < 2:8.2.1815-2
+Conflicts: vim-minimal < 2:8.2.1885-2
 # vim bundles libvterm, which is used during build - so we need to provide
 # bundled libvterm for catching possible libvterm CVEs
 Provides: bundled(libvterm)
@@ -826,6 +826,12 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
 
 %changelog
+* Mon Dec 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2143-1
+- patchlevel 2143
+
+* Mon Dec 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2115-2
+- 1907335 - installing vim no longer works, due to package conflicts with vim-minimal
+
 * Wed Dec 09 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2115-1
 - patchlevel 2115