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 + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Tue Sep 29 10:00:25 UTC 2020 - Thorsten Kukuk 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}