move vim.fish to vendor_functions.d

The previous place, vendor_conf.d, blocks autoloading user defined
aliases with the same name, because it is loaded before all dirs for functions.
Then user defined functions with the same name are not loaded, because the name
is already defined.
This commit is contained in:
Zdenek Dohnal 2020-11-02 11:01:54 +01:00
parent cf4c49ef15
commit 8df98f5841

View File

@ -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
@ -543,7 +543,8 @@ install -p -m644 %{SOURCE16} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-e
install -p -m644 %{SOURCE17} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.csh install -p -m644 %{SOURCE17} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.csh
mkdir -p %{buildroot}/%{_datadir}/fish/vendor_conf.d/ mkdir -p %{buildroot}/%{_datadir}/fish/vendor_conf.d/
install -p -m644 %{SOURCE18} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish install -p -m644 %{SOURCE18} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish
install -p -m644 %{SOURCE19} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim.fish mkdir -p %{buildroot}/%{_datadir}/fish/vendor_functions.d/
install -p -m644 %{SOURCE19} %{buildroot}/%{_datadir}/fish/vendor_functions.d/vim.fish
install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/virc install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/virc
install -p -m644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/vimrc install -p -m644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/vimrc
@ -742,8 +743,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%endif %endif
%files minimal %files minimal
%dir %{_datadir}/fish/vendor_conf.d %dir %{_datadir}/fish/vendor_functions.d
%{_datadir}/fish/vendor_conf.d/vim.fish %{_datadir}/fish/vendor_functions.d/vim.fish
%dir %{_sysconfdir}/profile.d %dir %{_sysconfdir}/profile.d
%config(noreplace) %{_sysconfdir}/profile.d/vim.* %config(noreplace) %{_sysconfdir}/profile.d/vim.*
%config(noreplace) %{_sysconfdir}/virc %config(noreplace) %{_sysconfdir}/virc
@ -760,8 +761,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%{_mandir}/man5/virc.* %{_mandir}/man5/virc.*
%files enhanced %files enhanced
%dir %{_datadir}/fish/vendor_conf.d %dir %{_datadir}/fish/vendor_functions.d
%{_datadir}/fish/vendor_conf.d/vim.fish %{_datadir}/fish/vendor_functions.d/vim.fish
%dir %{_sysconfdir}/profile.d %dir %{_sysconfdir}/profile.d
%config(noreplace) %{_sysconfdir}/profile.d/vim.* %config(noreplace) %{_sysconfdir}/profile.d/vim.*
%{_bindir}/vim %{_bindir}/vim
@ -823,6 +824,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
* Mon Nov 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1885-2
- move vim.fish to vendor_functions.d
* Thu Oct 22 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1885-1 * Thu Oct 22 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1885-1
- patchlevel 1885 - patchlevel 1885