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

remove old conflicts

Browse Source
This commit is contained in:
Zdenek Dohnal 2020-12-18 08:45:19 +01:00
parent 097601b324
commit d334e39904
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vim.spec
View File

@ -88,7 +88,6 @@ Requires: desktop-file-utils
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
%endif %endif
Epoch: 2 Epoch: 2
Conflicts: filesystem < 3
%description %description
VIM (VIsual editor iMproved) is an updated and improved version of the 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 %package common
Summary: The common files needed by any version of the VIM editor Summary: The common files needed by any version of the VIM editor
Conflicts: man-pages-fr < 0.9.7-14 # remove when a new RHEL is released (current 8)
Conflicts: man-pages-it < 0.3.0-17
Conflicts: man-pages-pl < 0.24-2
Conflicts: %{name}-minimal < %{epoch}:8.1.1-1 Conflicts: %{name}-minimal < %{epoch}:8.1.1-1
Requires: %{name}-filesystem Requires: %{name}-filesystem
@ -126,6 +123,7 @@ many different languages.
%package minimal %package minimal
Summary: A minimal version of the VIM editor Summary: A minimal version of the VIM editor
# conflicts in package because of manpage move (bug #1599663) # 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: %{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)
@ -831,6 +829,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%changelog %changelog
* Fri Dec 18 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2146-2 * 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 - 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 * Wed Dec 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2146-1
- patchlevel 2146 - patchlevel 2146