From 0c1edfb747420da4eb35318e7c4ee799cde2cabe7c42fbe399845ba44a67310a Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Wed, 4 Jan 2023 14:35:22 +0000
Subject: [PATCH] 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
---
 vim.changes | 5 +++++
 vim.spec    | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/vim.changes b/vim.changes
index e1b7eef..c281bb6 100644
--- a/vim.changes
+++ b/vim.changes
@@ -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>
 
diff --git a/vim.spec b/vim.spec
index 75b4618..d578770 100644
--- a/vim.spec
+++ b/vim.spec
@@ -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