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#d334e39904ae51ed3edf7e7849b5e9dca422add1

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
@@ -88,7 +88,6 @@ Requires: desktop-file-utils
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 %endif
 Epoch: 2
-Conflicts: filesystem < 3
 
 %description
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -98,9 +97,7 @@ multiple windows, multi-level undo, block highlighting and more.
 
 %package common
 Summary: The common files needed by any version of the VIM editor
-Conflicts: man-pages-fr < 0.9.7-14
+# remove when a new RHEL is released (current 8)
-Conflicts: man-pages-it < 0.3.0-17
-Conflicts: man-pages-pl < 0.24-2
 Conflicts: %{name}-minimal < %{epoch}:8.1.1-1
 Requires: %{name}-filesystem
 
@@ -126,9 +123,11 @@ 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
 # now vim-minimal ships vim.sh, vim.csh and vim.fish too, so we need to conflict
-Conflicts: vim-enhanced < 2:8.2.1885-2
+# remove when a new RHEL is released (current 8)
+Conflicts: vim-enhanced <= 2:8.2.2146-2
 Provides: vi
 Provides: %{_bindir}/vi
 
@@ -144,7 +143,8 @@ 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.1885-2
+# remove when a new RHEL is released (current 8)
+Conflicts: vim-minimal <= 2:8.2.2146-2
 # vim bundles libvterm, which is used during build - so we need to provide
 # bundled libvterm for catching possible libvterm CVEs
 Provides: bundled(libvterm)
@@ -539,13 +539,16 @@ chmod 644 %{buildroot}/%{_datadir}/%{name}/%{vimdir}/doc/vim2html.pl \
 chmod 644 ../runtime/doc/vim2html.pl
 
 mkdir -p %{buildroot}/%{_sysconfdir}/profile.d
+install -p -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/profile.d/vi.sh
 install -p -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/profile.d/vim.sh
+install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/profile.d/vi.csh
 install -p -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/profile.d/vim.csh
 install -p -m644 %{SOURCE16} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.sh
 install -p -m644 %{SOURCE17} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.csh
 mkdir -p %{buildroot}/%{_datadir}/fish/vendor_conf.d/
 install -p -m644 %{SOURCE18} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish
 mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
+install -p -m644 %{SOURCE19} %{buildroot}/%{_datadir}/fish/vendor_functions.d/vi.fish
 install -p -m644 %{SOURCE19} %{buildroot}/%{_datadir}/fish/vendor_functions.d/vim.fish
 install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/virc
 install -p -m644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/vimrc
@@ -746,8 +749,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 
 %files minimal
 %dir %{_datadir}/fish/vendor_functions.d
-%ghost %{_datadir}/fish/vendor_functions.d/vim.fish
+%{_datadir}/fish/vendor_functions.d/vi.fish
-%ghost %config(noreplace) %{_sysconfdir}/profile.d/vim.*
+%config(noreplace) %{_sysconfdir}/profile.d/vi.*
 %config(noreplace) %{_sysconfdir}/virc
 %{_bindir}/ex
 %{_bindir}/vi
@@ -763,8 +766,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 
 %files enhanced
 %dir %{_datadir}/fish/vendor_functions.d
-%ghost %{_datadir}/fish/vendor_functions.d/vim.fish
+%{_datadir}/fish/vendor_functions.d/vim.fish
-%ghost %config(noreplace) %{_sysconfdir}/profile.d/vim.*
+%config(noreplace) %{_sysconfdir}/profile.d/vim.*
 %{_bindir}/vim
 %{_bindir}/rvim
 %{_bindir}/vimdiff
@@ -824,6 +827,10 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
 %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
 
 %changelog
+* Fri Dec 18 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2146-2
+- install vim-minimal profiles under different name to avoid future conflicts
+- remove old conflicts
+
 * Wed Dec 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2146-1
 - patchlevel 2146