From 5d70ada42ac46630f6d584c98630ac513b59fffe8919a3f9988eceaa5aa956a3 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 13 Jan 2023 07:38:52 +0000
Subject: [PATCH] Accepting request 1055731 from home:lnussel:usrmerge

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

OBS-URL: https://build.opensuse.org/request/show/1055731
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=631
---
 rpm.changes | 5 +++++
 rpm.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/rpm.changes b/rpm.changes
index 78c903a..ef9f6ce 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 13:17:31 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Mon Dec 12 08:58:58 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/rpm.spec b/rpm.spec
index f23e071..726a576 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -275,7 +275,7 @@ mkdir -p %{buildroot}/usr/share/locale
 ln -s ../share/locale %{buildroot}/usr/lib/locale
 %make_install
 mkdir -p %{buildroot}/bin
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 ln -s /usr/bin/rpm %{buildroot}/bin/rpm
 %endif
 # remove .la file and the static variant of libpopt
@@ -391,7 +391,7 @@ fi
 %license 	COPYING
 %doc 	docs/manual
 	/etc/rpm
-%if !0%{?usrmerged}
+%if 0%{?suse_version} < 1550
 	/bin/rpm
 %endif
 	%{_bindir}/gendiff