remove old conflicts
This commit is contained in:
parent
097601b324
commit
d334e39904
7
vim.spec
7
vim.spec
@ -88,7 +88,6 @@ Requires: desktop-file-utils
|
||||
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
|
||||
%endif
|
||||
Epoch: 2
|
||||
Conflicts: filesystem < 3
|
||||
|
||||
%description
|
||||
VIM (VIsual editor iMproved) is an updated and improved version of the
|
||||
@ -98,9 +97,7 @@ multiple windows, multi-level undo, block highlighting and more.
|
||||
|
||||
%package common
|
||||
Summary: The common files needed by any version of the VIM editor
|
||||
Conflicts: man-pages-fr < 0.9.7-14
|
||||
Conflicts: man-pages-it < 0.3.0-17
|
||||
Conflicts: man-pages-pl < 0.24-2
|
||||
# remove when a new RHEL is released (current 8)
|
||||
Conflicts: %{name}-minimal < %{epoch}:8.1.1-1
|
||||
Requires: %{name}-filesystem
|
||||
|
||||
@ -126,6 +123,7 @@ many different languages.
|
||||
%package minimal
|
||||
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
|
||||
# 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)
|
||||
@ -831,6 +829,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
|
||||
%changelog
|
||||
* Fri Dec 18 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2146-2
|
||||
- install vim-minimal profiles under different name to avoid future conflicts
|
||||
- remove old conflicts
|
||||
|
||||
* Wed Dec 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2146-1
|
||||
- patchlevel 2146
|
||||
|
Loading…
Reference in New Issue
Block a user