diff --git a/.gitignore b/.gitignore index 9451544..306bac1 100644 --- a/.gitignore +++ b/.gitignore @@ -341,3 +341,4 @@ /vim-8.2-2311.tar.bz2 /vim-8.2-2451.tar.bz2 /vim-8.2-2465.tar.bz2 +/vim-8.2-2488.tar.bz2 diff --git a/sources b/sources index 3e12735..a7ee04b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2465.tar.bz2) = 9e7b7ace89d66ff981fb7fa7ba382a9c3f1035d8804ae9386ef08d82f406d9f179d2691a90a4bb758fdc81685e546aafc8e844ea78ac47ad746b6f719f7fcaa7 +SHA512 (vim-8.2-2488.tar.bz2) = 84fec937ac5c1bb3c9f98500973df3454bd76b5b42318676cfe5cec592e8b4210d1b652c8b9824b734cda220ec5fdfd800ecea51a87b5b3cdb6efcaa11e89859 diff --git a/vim.spec b/vim.spec index 722f822..c37c94e 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2465 +%define patchlevel 2488 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -21,7 +21,7 @@ Summary: The VIM editor URL: http://www.vim.org/ Name: vim Version: %{baseversion}.%{patchlevel} -Release: 3%{?dist} +Release: 1%{?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.2465-3 -Obsoletes: vim-wrappers < 2:8.2.2465-3 +Conflicts: vim-wrappers < 2:8.2.2488-1 +Obsoletes: vim-wrappers < 2:8.2.2488-1 Provides: vi Provides: %{_bindir}/vi @@ -142,8 +142,8 @@ 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.2465-3 -Obsoletes: vim-wrappers < 2:8.2.2465-3 +Conflicts: vim-wrappers < 2:8.2.2488-1 +Obsoletes: vim-wrappers < 2:8.2.2488-1 # vim bundles libvterm, which is used during build - so we need to provide # bundled libvterm for catching possible libvterm CVEs Provides: bundled(libvterm) @@ -820,6 +820,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Tue Feb 09 2021 Zdenek Dohnal - 2:8.2.2488-1 +- patchlevel 2488 + * Tue Feb 09 2021 Zdenek Dohnal - 2:8.2.2465-2 - remove vim-wrappers, vim is a binary again, vi and view stay as wrappers - removed vim -> vi functionality, because it cannot be optional and work