From cdd3182beee1c97918cacb130172c14e4f6bf487ca8f84b32b1aa2fd68a49284 Mon Sep 17 00:00:00 2001 From: Radoslav Kolev Date: Tue, 15 Nov 2022 09:31:32 +0000 Subject: [PATCH] Accepting request 1035770 from home:radolin:branches:Base:System - Fix build under SLE12 OBS-URL: https://build.opensuse.org/request/show/1035770 OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=112 --- busybox.changes | 5 +++++ busybox.spec | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/busybox.changes b/busybox.changes index a389c1c..e94b51e 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 14 08:52:35 UTC 2022 - Radoslav Kolev + +- Fix build under SLE-12 + ------------------------------------------------------------------- Mon Oct 17 17:26:27 UTC 2022 - Radoslav Kolev diff --git a/busybox.spec b/busybox.spec index 09ec280..e6e1708 100644 --- a/busybox.spec +++ b/busybox.spec @@ -46,7 +46,12 @@ Patch2: testsuite-gnu-echo.patch Patch100: busybox.install.patch Provides: useradd_or_adduser_dep BuildRequires: glibc-devel-static +#in SLE12 hostname is part of the net-tools package +%if %{?suse_version} && %{?suse_version} <= 1315 +BuildRequires: net-tools +%else BuildRequires: hostname +%endif BuildRequires: pkgconfig(libselinux) # for test suite BuildRequires: zip @@ -92,7 +97,9 @@ cd /usr/share/busybox/testsuite PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest %prep +#SLE12 needs an empty line after autosetup for it to expand properly (bsc#1205420) %autosetup -p1 + find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \ -exec rm -Rf {} +