From eb227c8ca4958a1d58c921ebcda199078c5eceb0 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Dec 16 2020 08:54:12 +0000
Subject: make profile files as ghosts to prevent further conflicts


---

diff --git a/vim.spec b/vim.spec
index b8f0a65..29502d5 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
@@ -128,7 +128,7 @@ Summary: A minimal version of the VIM editor
 # conflicts in package because of manpage move (bug #1599663)
 Conflicts: %{name}-common < %{epoch}:8.1.1-1
 # now vim-minimal ships vim.sh, vim.csh and vim.fish too, so we need to conflict
-Conflicts: vim-enhanced < 2:8.2.1815-2
+Conflicts: vim-enhanced < 2:8.2.1885-2
 Provides: vi
 Provides: %{_bindir}/vi
 
@@ -746,9 +746,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 
 %files minimal
 %dir %{_datadir}/fish/vendor_functions.d
-%{_datadir}/fish/vendor_functions.d/vim.fish
+%ghost %{_datadir}/fish/vendor_functions.d/vim.fish
 %dir %{_sysconfdir}/profile.d
-%config(noreplace) %{_sysconfdir}/profile.d/vim.*
+%ghost %config(noreplace) %{_sysconfdir}/profile.d/vim.*
 %config(noreplace) %{_sysconfdir}/virc
 %{_bindir}/ex
 %{_bindir}/vi
@@ -764,9 +764,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 
 %files enhanced
 %dir %{_datadir}/fish/vendor_functions.d
-%{_datadir}/fish/vendor_functions.d/vim.fish
+%ghost %{_datadir}/fish/vendor_functions.d/vim.fish
 %dir %{_sysconfdir}/profile.d
-%config(noreplace) %{_sysconfdir}/profile.d/vim.*
+%ghost %config(noreplace) %{_sysconfdir}/profile.d/vim.*
 %{_bindir}/vim
 %{_bindir}/rvim
 %{_bindir}/vimdiff
@@ -826,6 +826,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
 
 %changelog
+* Wed Dec 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2143-2
+- make profile files as ghosts to prevent further conflicts
+
 * Mon Dec 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2143-1
 - patchlevel 2143