From 6a934f62de5b7be6af1d14174aa9049b9ea8d027 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Jun 10 2021 08:42:09 +0000
Subject: 1969936 - Failed to source defaults.vim


---

diff --git a/vim.spec b/vim.spec
index 09c5395..ba71360 100644
--- a/vim.spec
+++ b/vim.spec
@@ -27,7 +27,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: virc
@@ -104,8 +104,10 @@ multiple windows, multi-level undo, block highlighting and more.
 
 %package common
 Summary: The common files needed by any version of the VIM editor
-# remove when a new RHEL is released (current 8)
-Conflicts: %{name}-minimal < %{epoch}:8.1.1-1
+# conflicts in package because of manpage move (bug #1599663)
+# conflicts because of defaults.vim (bug #1969936)
+# remove after RHEL 8+2 is released
+Conflicts: %{name}-minimal < %{epoch}:8.2.2956-2
 Requires: %{name}-filesystem
 
 %description common
@@ -130,8 +132,10 @@ many different languages.
 %package minimal
 Summary: A minimal version of the VIM editor
 # conflicts in package because of manpage move (bug #1599663)
-# remove when a new RHEL is released (current 8)
-Conflicts: %{name}-common < %{epoch}:8.1.1-1
+# conflicts because of defaults.vim (bug #1969936)
+# remove after RHEL 8+2 is released
+Conflicts: %{name}-common < %{epoch}:8.2.2956-2
+# remove Conflicts+Obsoletes for wrappers after F34 is EOL
 Conflicts: vim-wrappers < 2:8.2.2488-1
 Obsoletes: vim-wrappers < 2:8.2.2488-1
 Provides: vi
@@ -764,6 +768,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %{_bindir}/rview
 %{_bindir}/vi
 %{_bindir}/view
+%{_datadir}/%{name}/%{vimdir}/defaults.vim
 %{_libexecdir}/vi
 %{_mandir}/man1/vi.*
 %{_mandir}/man1/ex.*
@@ -834,6 +839,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %endif
 
 %changelog
+* Thu Jun 10 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2956-2
+- 1969936 - Failed to source defaults.vim
+
 * Mon Jun 07 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2956-1
 - patchlevel 2956