From b0675d2f636fa2aa58cbecf26aa4494925ffe68751575ce411bff24a147e2b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 24 Nov 2020 17:49:03 +0000 Subject: [PATCH] Accepting request 850581 from home:lnussel:usrmove - prepare usrmerge (boo#1029961) OBS-URL: https://build.opensuse.org/request/show/850581 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=637 --- vim.changes | 5 +++++ vim.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/vim.changes b/vim.changes index 459f96c..3ea2b3c 100644 --- a/vim.changes +++ b/vim.changes @@ -161,6 +161,11 @@ Sun Oct 25 11:44:15 UTC 2020 - Ondřej Súkup * Crash in out-of-memory situation. * Vim9: command modifiers do not work. +------------------------------------------------------------------- +Fri Oct 16 10:25:42 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Tue Oct 13 06:21:33 UTC 2020 - Ondřej Súkup diff --git a/vim.spec b/vim.spec index 6321703..cb2609a 100644 --- a/vim.spec +++ b/vim.spec @@ -312,11 +312,15 @@ ln -s -f %{_sysconfdir}/alternatives/vi %{buildroot}%{_bindir}/vi # compat symlinks mkdir %{buildroot}/bin +%if !0%{?usrmerged} ln -s -f %{_bindir}/vim %{buildroot}/bin/vi ln -s -f %{_bindir}/vim %{buildroot}/bin/vim +%endif ln -s -f vim %{buildroot}%{_bindir}/vi ln -s -f vim %{buildroot}%{_bindir}/edit +%if !0%{?usrmerged} ln -s -f %{_bindir}/vim %{buildroot}/bin/ex +%endif # man pages ln -s -f vim.1.gz %{buildroot}%{_mandir}/man1/vi.1.gz @@ -460,9 +464,11 @@ fi %{_bindir}/vim-nox11 %{_bindir}/vim # symlinks +%if !0%{?usrmerged} /bin/vi /bin/vim /bin/ex +%endif %{_bindir}/edit %{_bindir}/ex %{_bindir}/rview