diff --git a/vim.spec b/vim.spec index 6d97ad2..ce7d61b 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 @@ -127,7 +127,7 @@ Summary: A minimal version of the VIM editor 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 # remove when a new RHEL is released (current 8) -Conflicts: vim-enhanced <= 2:8.2.2146-2 +Conflicts: vim-enhanced < 2:8.2.2146-2 Provides: vi Provides: %{_bindir}/vi @@ -144,7 +144,7 @@ only available when the vim-common package is installed. 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 # remove when a new RHEL is released (current 8) -Conflicts: vim-minimal <= 2:8.2.2146-2 +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) @@ -827,6 +827,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Mon Jan 11 2021 Zdenek Dohnal - 2:8.2.2311-2 +- conflicting the version when the change happened doesnt make sense + * Fri Jan 08 2021 Zdenek Dohnal - 2:8.2.2311-1 - patchlevel 2311