From 5689b35720142aced63fa268064f045362ec7d5b0912cb1f92648506cbcbace4 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Thu, 3 Dec 2020 13:59:15 +0000
Subject: [PATCH] Accepting request 852893 from home:lnussel:usrmove

- prepare usrmerge (boo#1029961)

OBS-URL: https://build.opensuse.org/request/show/852893
OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=78
---
 busybox.changes | 5 +++++
 busybox.spec    | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/busybox.changes b/busybox.changes
index 915dc92..b0a22ed 100644
--- a/busybox.changes
+++ b/busybox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 20 08:59:57 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
 -------------------------------------------------------------------
 Tue Sep 29 10:00:25 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/busybox.spec b/busybox.spec
index 5f6b11e..82c1564 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -92,6 +92,9 @@ cp -a %{SOURCE2} .config
 make %{?_smp_mflags} -e oldconfig
 make -e %{?_smp_mflags}
 make -e doc busybox.links %{?_smp_mflags}
+%if 0%{?usrmerged}
+sed -i -e 's,^/\(s\?bin\)/,/usr/\1/,' busybox.links
+%endif
 
 %install
 install -d %{buildroot}/%{_bindir}