Accepting request 852917 from Base:System

OBS-URL: https://build.opensuse.org/request/show/852917 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=62
2020-12-04 20:27:45 +00:00 · 2020-12-04 20:27:45 +00:00 · 738a3cb886
commit 738a3cb886
parent c7fa3533de 5689b35720
2 changed files with 8 additions and 0 deletions
--- 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>

--- 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}