rpms/vim
6
0
Fork 0
Code Issues Pull Requests Releases Activity

conflicting the version when the change happened doesnt make sense

Browse Source
This commit is contained in:
Zdenek Dohnal 2021-01-11 15:40:57 +01:00
parent c8a7b65903
commit e7eb5ae2e9
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vim.spec
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
@ -127,7 +127,7 @@ Summary: A minimal version of the VIM editor
Conflicts: %{name}-common < %{epoch}:8.1.1-1 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 # 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) # 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: vi
Provides: %{_bindir}/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 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
# remove when a new RHEL is released (current 8) # 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 # 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)
@ -827,6 +827,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 Jan 11 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2311-2
- conflicting the version when the change happened doesnt make sense
* Fri Jan 08 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2311-1 * Fri Jan 08 2021 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2311-1
- patchlevel 2311 - patchlevel 2311