Fix various issues with vim-default-editor

Fix fish profile installation, set virtual provide system-default-editor
(thanks Neal Gompa and Kamil Dudka), conflict with earlier nano-default-editor,
because it hasn't provided the virtual provide yet.
This commit is contained in:
Zdenek Dohnal 2020-10-12 17:27:49 +02:00
parent d8e67b2f1e
commit d44733b481

View File

@ -220,13 +220,16 @@ with graphics and mouse capabilities. You'll also need to install the
vim-common package.
%package default-editor
Summary: Set vim as a default editor
Summary: Set vim as the default editor
Requires: vim-enhanced
BuildArch: noarch
Conflicts: nano-default-editor
Provides: system-default-editor
Conflicts: system-default-editor
# conflict with nano-default-editor which doesn't provide system-default-editor
Conflicts: nano-default-editor < 5.3-3
%description default-editor
This subpackage contains files needed to set Vim as a default editor.
This subpackage contains files needed to set Vim as the default editor.
%prep
%setup -q -b 0 -n %{vimdir}
@ -533,9 +536,11 @@ cp %{SOURCE1} %{buildroot}/%{_sysconfdir}/profile.d/vim.sh
cp %{SOURCE2} %{buildroot}/%{_sysconfdir}/profile.d/vim.csh
cp %{SOURCE16} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.sh
cp %{SOURCE17} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.csh
cp %{SOURCE18} %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.fish
chmod 0644 %{buildroot}/%{_sysconfdir}/profile.d/vim.*
chmod 0644 %{buildroot}/%{_sysconfdir}/profile.d/vim-default-editor.*
mkdir -p %{buildroot}/%{_datadir}/fish/vendor_conf.d/
cp %{SOURCE18} %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish
chmod 0644 %{buildroot}/%{_datadir}/fish/vendor_conf.d/vim-default-editor.fish
install -p -m644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/virc
install -p -m644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/vimrc
@ -802,9 +807,17 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags
%{_datadir}/icons/locolor/*/apps/*
%files default-editor
%dir %{_sysconfdir}/profile.d
%config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.*
%dir %{_datadir}/fish/vendor_conf.d
%config(noreplace) %{_datadir}/fish/vendor_conf.d/vim-default-editor.fish
%changelog
* Mon Oct 12 2020 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.2.1815-2
- fix installing fish profile, set virtual provide for default editor
(thanks Neal Gompa and Kamil Dudka)
- set conflicts to nano-default-editor which doesnt provide system-default-editor
* Fri Oct 09 2020 Paweł Marciniak <sunwire+repo@gmail.com> - 2:8.2.1815-2
- A new subpackage, set vim as a default editor.