diff --git a/PKGBUILD b/PKGBUILD index 04a6b23..28d2ac3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20171117 +pkgver=20171121 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec index aefbd30..ea7bf69 100644 --- a/build-mkbaselibs-sle.spec +++ b/build-mkbaselibs-sle.spec @@ -20,14 +20,18 @@ Name: build-mkbaselibs-sle Summary: Tools to generate base lib packages License: GPL-2.0+ Group: Development/Tools/Building -Version: 20171117 +Version: 20171121 Release: 0 #!BuildIgnore: build-mkbaselibs +#!BuildIgnore: build-mkbaselibs-sle Provides: build-mkbaselibs Conflicts: otherproviders(build-mkbaselibs) Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +%if 0%{?is_opensuse} +ExclusiveArch: do-not-build +%endif %description This package contains the parts which may be installed in the inner build system diff --git a/build.changes b/build.changes index 29a21a5..4207d65 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 21 09:12:41 UTC 2017 - coolo@suse.com + +- buildignore the sle flavor of mkbaselibs for sle + ------------------------------------------------------------------- Fri Nov 17 09:36:04 UTC 2017 - adrian@suse.de diff --git a/build.dsc b/build.dsc index 7b2b081..78b91a1 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20171117 +Version: 20171121 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index dc7c6a1..f8aef26 100644 --- a/build.spec +++ b/build.spec @@ -22,13 +22,16 @@ Name: build Summary: A Script to Build SUSE Linux RPMs License: GPL-2.0+ and GPL-2.0 Group: Development/Tools/Building -Version: 20171117 +Version: 20171121 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 # Keep the following dependencies in sync with obs-worker package diff --git a/debian.changelog b/debian.changelog index 83f30fd..207d11c 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20171117) unstable; urgency=low +build (20171121) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20171117.tar.gz b/obs-build-20171117.tar.gz deleted file mode 100644 index 558e356..0000000 --- a/obs-build-20171117.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:23fd600470e5bfc557800132206b9ba96d1a47373229dec91beb6318b9fdda48 -size 311395 diff --git a/obs-build-20171121.tar.gz b/obs-build-20171121.tar.gz new file mode 100644 index 0000000..2987d8d --- /dev/null +++ b/obs-build-20171121.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fce27b91b8c5b983921c6d5b79bb61da1866c72ef41fbb799565405cb041ac5 +size 288485