Accepting request 1055973 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1055973 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/busybox?expand=0&rev=81
This commit is contained in:
commit
348e8ec0bf
@ -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>
|
Wed Nov 23 13:24:55 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package busybox
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -135,7 +135,7 @@ make %{?_smp_mflags} -e oldconfig
|
|||||||
make -e
|
make -e
|
||||||
make -e doc busybox.links %{?_smp_mflags}
|
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
|
for i in busybox.links %{?with_ww3:busybox-warewulf3.links}; do
|
||||||
sed -i -e 's,^/\(s\?bin\)/,/usr/\1/,' $i
|
sed -i -e 's,^/\(s\?bin\)/,/usr/\1/,' $i
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user