diff --git a/vim.spec b/vim.spec index f4df9d40..b9460a7e 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: virc @@ -126,8 +126,8 @@ 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: vim-wrappers < 2:8.2.2488-1 -Obsoletes: vim-wrappers < 2:8.2.2488-1 +Conflicts: vim-wrappers < 2:8.2.2488-2 +Obsoletes: vim-wrappers < 2:8.2.2488-2 Provides: vi Provides: %{_bindir}/vi @@ -142,8 +142,7 @@ only available when the vim-common package is installed. %package enhanced Summary: A version of the VIM editor which includes recent enhancements -Conflicts: vim-wrappers < 2:8.2.2488-1 -Obsoletes: vim-wrappers < 2:8.2.2488-1 +Conflicts: vim-wrappers < 2:8.2.2488-2 # vim bundles libvterm, which is used during build - so we need to provide # bundled libvterm for catching possible libvterm CVEs Provides: bundled(libvterm) @@ -819,7 +818,11 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %dir %{_sysconfdir}/profile.d %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* + %changelog +* Mon Mar 01 2021 Zdenek Dohnal - 2:8.2.2541-2 +- rebuilt + * Mon Feb 22 2021 Zdenek Dohnal - 2:8.2.2541-1 - patchlevel 2541 - 1931099 - Build version numbers don't match the actual build patchlevel