From 580c5e93e62f904f6e68f0affd6cb3e3050b9bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 23 Nov 2017 08:19:17 +0000 Subject: [PATCH] fix build OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=341 --- build.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/build.spec b/build.spec index 3ad4b72a..01861b63 100644 --- a/build.spec +++ b/build.spec @@ -27,13 +27,7 @@ Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -# mkbaselibs is pulled in by prjconf, but since we only build it here, does not exist when bootstrapping -#!BuildIgnore: build-mkbaselibs -%if 0%{?suse_version} > 1200 -# required for test suite -#!BuildIgnore: build-mkbaselibs-sle -BuildRequires: build-mkbaselibs -%endif +#!BuildIgnore: build-mkbaselibs build-mkbaselibs-sle # Keep the following dependencies in sync with obs-worker package Requires: bash Requires: binutils @@ -209,6 +203,8 @@ echo "test suite is not prepared to run using qemu linux user" echo "Skipping test case" exit 0 %endif +# we need to patch the not packaged configs, due to the buildignore +sed -i 's,build-mkbaselibs,,' ../configs/*.conf ./testbuild.sh /.build.binaries/ %files