make profile files as ghosts to prevent further conflicts
This commit is contained in:
parent
6f00361810
commit
eb227c8ca4
15
vim.spec
15
vim.spec
@ -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
|
||||||
@ -128,7 +128,7 @@ 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)
|
||||||
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
|
||||||
Conflicts: vim-enhanced < 2:8.2.1815-2
|
Conflicts: vim-enhanced < 2:8.2.1885-2
|
||||||
Provides: vi
|
Provides: vi
|
||||||
Provides: %{_bindir}/vi
|
Provides: %{_bindir}/vi
|
||||||
|
|
||||||
@ -746,9 +746,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
|
|||||||
|
|
||||||
%files minimal
|
%files minimal
|
||||||
%dir %{_datadir}/fish/vendor_functions.d
|
%dir %{_datadir}/fish/vendor_functions.d
|
||||||
%{_datadir}/fish/vendor_functions.d/vim.fish
|
%ghost %{_datadir}/fish/vendor_functions.d/vim.fish
|
||||||
%dir %{_sysconfdir}/profile.d
|
%dir %{_sysconfdir}/profile.d
|
||||||
%config(noreplace) %{_sysconfdir}/profile.d/vim.*
|
%ghost %config(noreplace) %{_sysconfdir}/profile.d/vim.*
|
||||||
%config(noreplace) %{_sysconfdir}/virc
|
%config(noreplace) %{_sysconfdir}/virc
|
||||||
%{_bindir}/ex
|
%{_bindir}/ex
|
||||||
%{_bindir}/vi
|
%{_bindir}/vi
|
||||||
@ -764,9 +764,9 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
|
|||||||
|
|
||||||
%files enhanced
|
%files enhanced
|
||||||
%dir %{_datadir}/fish/vendor_functions.d
|
%dir %{_datadir}/fish/vendor_functions.d
|
||||||
%{_datadir}/fish/vendor_functions.d/vim.fish
|
%ghost %{_datadir}/fish/vendor_functions.d/vim.fish
|
||||||
%dir %{_sysconfdir}/profile.d
|
%dir %{_sysconfdir}/profile.d
|
||||||
%config(noreplace) %{_sysconfdir}/profile.d/vim.*
|
%ghost %config(noreplace) %{_sysconfdir}/profile.d/vim.*
|
||||||
%{_bindir}/vim
|
%{_bindir}/vim
|
||||||
%{_bindir}/rvim
|
%{_bindir}/rvim
|
||||||
%{_bindir}/vimdiff
|
%{_bindir}/vimdiff
|
||||||
@ -826,6 +826,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
|
||||||
|
* Wed Dec 16 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2143-2
|
||||||
|
- make profile files as ghosts to prevent further conflicts
|
||||||
|
|
||||||
* Mon Dec 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2143-1
|
* Mon Dec 14 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.2143-1
|
||||||
- patchlevel 2143
|
- patchlevel 2143
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user