diff --git a/.gitignore b/.gitignore index 4416f7a1..e9c0846e 100644 --- a/.gitignore +++ b/.gitignore @@ -328,3 +328,4 @@ /vim-8.2-1805.tar.bz2 /vim-8.2-1815.tar.bz2 /vim-8.2-1885.tar.bz2 +/vim-8.2-1941.tar.bz2 diff --git a/sources b/sources index fbf6eb81..28c53dd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-1885.tar.bz2) = 76eb36b55c668b367056b3d4533e19246ee9af9fda527d5cf0fa5eef2e5661e4609e8f2a19fbceb444615ce266c0f90adea420a29248be87a9f4cd32c4593898 +SHA512 (vim-8.2-1941.tar.bz2) = ded21c61f43327f3dbd559d254a525f5ad0283f93910624b2694c482244a18027d7bf4dca787bf458ff10687ae85651975411a22a0e53fb1120dc08ac4a5fb2e diff --git a/vim.spec b/vim.spec index 80e303cc..f3c44e33 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 1885 +%define patchlevel 1941 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -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 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 %{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 %{SOURCE5} %{buildroot}/%{_sysconfdir}/vimrc @@ -742,8 +743,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %endif %files minimal -%dir %{_datadir}/fish/vendor_conf.d -%{_datadir}/fish/vendor_conf.d/vim.fish +%dir %{_datadir}/fish/vendor_functions.d +%{_datadir}/fish/vendor_functions.d/vim.fish %dir %{_sysconfdir}/profile.d %config(noreplace) %{_sysconfdir}/profile.d/vim.* %config(noreplace) %{_sysconfdir}/virc @@ -760,8 +761,8 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_mandir}/man5/virc.* %files enhanced -%dir %{_datadir}/fish/vendor_conf.d -%{_datadir}/fish/vendor_conf.d/vim.fish +%dir %{_datadir}/fish/vendor_functions.d +%{_datadir}/fish/vendor_functions.d/vim.fish %dir %{_sysconfdir}/profile.d %config(noreplace) %{_sysconfdir}/profile.d/vim.* %{_bindir}/vim @@ -823,6 +824,12 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Mon Nov 02 2020 Zdenek Dohnal - 2:8.2.1941-1 +- patchlevel 1941 + +* Mon Nov 02 2020 Zdenek Dohnal - 2:8.2.1885-2 +- move vim.fish to vendor_functions.d + * Thu Oct 22 2020 Zdenek Dohnal - 2:8.2.1885-1 - patchlevel 1885