From 2db1d1b4b6b20ecc779e9fedf95ab6804d26cb72 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Dec 14 2020 10:42:01 +0000
Subject: 1907335 - installing vim no longer works, due to package conflicts with vim-minimal


---

diff --git a/vim.spec b/vim.spec
index e133e7c..c13ef52 100644
--- a/vim.spec
+++ b/vim.spec
@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim and MIT
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
 Source1: vim.sh
@@ -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,9 @@ 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.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