1907335 - installing vim no longer works, due to package conflicts with vim-minimal

This commit is contained in:
Zdenek Dohnal 2020-12-14 11:42:01 +01:00
parent e59c5ebce8
commit 2db1d1b4b6

View File

@ -21,7 +21,7 @@ Summary: The VIM editor
URL: http://www.vim.org/ URL: http://www.vim.org/
Name: vim Name: vim
Version: %{baseversion}.%{patchlevel} Version: %{baseversion}.%{patchlevel}
Release: 1%{?dist} Release: 2%{?dist}
License: Vim and MIT License: Vim and MIT
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
Source1: vim.sh Source1: vim.sh
@ -144,7 +144,7 @@ only available when the vim-common package is installed.
%package enhanced %package enhanced
Summary: A version of the VIM editor which includes recent enhancements 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 # 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 # vim bundles libvterm, which is used during build - so we need to provide
# bundled libvterm for catching possible libvterm CVEs # bundled libvterm for catching possible libvterm CVEs
Provides: bundled(libvterm) Provides: bundled(libvterm)
@ -826,6 +826,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
%changelog %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 * Wed Dec 09 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2115-1
- patchlevel 2115 - patchlevel 2115