Accepting request 1055751 from home:lnussel:usrmerge

Replace transitional %usrmerged macro with regular version check (boo#1206798)

OBS-URL: https://build.opensuse.org/request/show/1055751
OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=772
This commit is contained in:
Martin Pluskal 2023-01-04 14:35:22 +00:00 committed by Git OBS Bridge
parent 3107a0ca3b
commit 0c1edfb747
2 changed files with 8 additions and 3 deletions

View File

@ -30,6 +30,11 @@ Wed Dec 28 17:06:17 UTC 2022 - Ondřej Súkup <mimi.vx@gmail.com>
* Code uses too much indent.
* Trying to resize a hashtab may cause a problem.
-------------------------------------------------------------------
Tue Dec 27 13:25:15 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
- Replace transitional %usrmerged macro with regular version check (boo#1206798)
-------------------------------------------------------------------
Mon Dec 19 10:39:20 UTC 2022 - Ondřej Súkup <mimi.vx@gmail.com>

View File

@ -374,12 +374,12 @@ done
# compat symlinks
mkdir %{buildroot}/bin
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
ln -s -f %{_bindir}/vim %{buildroot}/bin/vi
ln -s -f %{_bindir}/vim %{buildroot}/bin/vim
%endif
ln -s -f vim %{buildroot}%{_bindir}/edit
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
ln -s -f %{_bindir}/vim %{buildroot}/bin/ex
%endif
@ -573,7 +573,7 @@ fi
%{_bindir}/vim-nox11
%{_bindir}/vim
# symlinks
%if !0%{?usrmerged}
%if 0%{?suse_version} < 1550
/bin/vi
/bin/vim
/bin/ex