From 47571d1a233f5ce75c380430a6455afb836675b50f077b22f52a19f993e590a7 Mon Sep 17 00:00:00 2001
From: Radoslav Kolev <radoslav.kolev@suse.com>
Date: Wed, 4 Jan 2023 18:07:01 +0000
Subject: [PATCH] Accepting request 1051647 from home:lnussel:usrmerge

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

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

diff --git a/busybox.changes b/busybox.changes
index e03d1cc..5b2047d 100644
--- a/busybox.changes
+++ b/busybox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 27 10:27:35 UTC 2022 - Ludwig Nussel <lnussel@suse.com>
+
+- Replace transitional %usrmerged macro with regular version check (boo#1206798)
+
 -------------------------------------------------------------------
 Wed Nov 23 13:24:55 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/busybox.spec b/busybox.spec
index 0e6ff67..dccdd8f 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package busybox
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -135,7 +135,7 @@ make %{?_smp_mflags} -e oldconfig
 make -e
 make -e doc busybox.links %{?_smp_mflags}
 
-%if 0%{?usrmerged}
+%if 0%{?suse_version} >= 1550
 for i in busybox.links %{?with_ww3:busybox-warewulf3.links}; do
     sed -i -e 's,^/\(s\?bin\)/,/usr/\1/,' $i
 done