vim.spec: Conflicts cleanup
This commit is contained in:
parent
7e4bad765b
commit
8c779e7840
14
vim.spec
14
vim.spec
@ -153,7 +153,7 @@ multiple windows, multi-level undo, block highlighting and more.
|
||||
Summary: The common files needed by any version of the VIM editor
|
||||
# conflicts in package because of manpage move (bug #1599663)
|
||||
# conflicts because of defaults.vim (bug #2026651)
|
||||
# remove after F36 EOL
|
||||
# remove after F36 EOL+after release CentOS Stream > 9
|
||||
Conflicts: %{name}-minimal < %{epoch}:8.2.3642-2
|
||||
# shared files between common and minimal
|
||||
Requires: %{name}-data = %{epoch}:%{version}-%{release}
|
||||
@ -182,11 +182,8 @@ many different languages.
|
||||
Summary: A minimal version of the VIM editor
|
||||
# conflicts in package because of manpage move (bug #1599663)
|
||||
# conflicts because of defaults.vim (bug #2026651)
|
||||
# remove after F36 EOL
|
||||
# remove after F36 EOL+after release CentOS Stream > 9
|
||||
Conflicts: %{name}-common < %{epoch}:8.2.3642-2
|
||||
# remove Conflicts+Obsoletes for wrappers after F34 is EOL
|
||||
Conflicts: vim-wrappers < 2:8.2.2488-1
|
||||
Obsoletes: vim-wrappers < 2:8.2.2488-1
|
||||
Provides: vi
|
||||
Provides: %{_bindir}/vi
|
||||
# shared files between common and minimal
|
||||
@ -203,8 +200,6 @@ only available when the vim-common package is installed.
|
||||
|
||||
%package enhanced
|
||||
Summary: A version of the VIM editor which includes recent enhancements
|
||||
# remove Conflicts for wrappers after F34 is EOL
|
||||
Conflicts: 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)
|
||||
@ -320,7 +315,7 @@ vim-common package.
|
||||
Summary: Shared data for Vi and Vim
|
||||
BuildArch: noarch
|
||||
# moved files from filesystem, common and minimal to data
|
||||
# remove after F36 EOL
|
||||
# remove after F36 EOL+after release of CentOS Stream > 9
|
||||
Conflicts: %{name}-common < 2:8.2.3642-2
|
||||
Conflicts: %{name}-filesystem < 2:8.2.3642-2
|
||||
Conflicts: %{name}-minimal < 2:8.2.3642-2
|
||||
@ -334,9 +329,6 @@ shared between vim-minimal and vim-common packages.
|
||||
Summary: Set vim as the default editor
|
||||
BuildArch: noarch
|
||||
Conflicts: system-default-editor
|
||||
# conflict with nano-default-editor which doesn't provide system-default-editor
|
||||
# remove after F33 is EOL
|
||||
Conflicts: nano-default-editor < 5.3-3
|
||||
Provides: system-default-editor
|
||||
Requires: vim-enhanced
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user