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

1599663 - Conflicting manpages rvi.1.gz and vi.1.gz during update

Browse Source
This commit is contained in:
Zdenek Dohnal 2018-07-10 13:16:45 +02:00
parent 1dc6d2965f
commit ac9812aaec
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vim.spec
View File

@ -24,7 +24,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: 5%{?dist} Release: 6%{?dist}
License: Vim License: Vim
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
@ -107,6 +107,8 @@ Conflicts: man-pages-fr < 0.9.7-14
Conflicts: man-pages-it < 0.3.0-17 Conflicts: man-pages-it < 0.3.0-17
Conflicts: man-pages-pl < 0.24-2 Conflicts: man-pages-pl < 0.24-2
Requires: %{name}-filesystem Requires: %{name}-filesystem
# conflicts in package because of manpage move (bug #1599663)
Conflicts: %{name}-minimal < 8.0.1428-4
%description common %description common
VIM (VIsual editor iMproved) is an updated and improved version of the VIM (VIsual editor iMproved) is an updated and improved version of the
@ -131,6 +133,8 @@ many different languages.
Summary: A minimal version of the VIM editor Summary: A minimal version of the VIM editor
Provides: vi = %{version}-%{release} Provides: vi = %{version}-%{release}
Provides: %{_bindir}/vi Provides: %{_bindir}/vi
# conflicts in package because of manpage move (bug #1599663)
Conflicts: %{name}-common < 8.0.1428-4
%description minimal %description minimal
VIM (VIsual editor iMproved) is an updated and improved version of the VIM (VIsual editor iMproved) is an updated and improved version of the
@ -764,6 +768,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%{_datadir}/icons/locolor/*/apps/* %{_datadir}/icons/locolor/*/apps/*
%changelog %changelog
* Tue Jul 10 2018 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.1.119-6
- 1599663 - Conflicting manpages rvi.1.gz and vi.1.gz during update
* Fri Jul 06 2018 Petr Pisar <ppisar@redhat.com> - 2:8.1.119-5 * Fri Jul 06 2018 Petr Pisar <ppisar@redhat.com> - 2:8.1.119-5
- Perl 5.28 rebuild - Perl 5.28 rebuild