From f78fded2af9e6845050acc84bd262752ab8ddc57 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 21 Nov 2017 09:16:57 +0000
Subject: [PATCH] - buildignore the sle flavor of mkbaselibs for sle

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=339
---
 PKGBUILD                  | 2 +-
 build-mkbaselibs-sle.spec | 6 +++++-
 build.changes             | 5 +++++
 build.dsc                 | 2 +-
 build.spec                | 5 ++++-
 debian.changelog          | 2 +-
 obs-build-20171117.tar.gz | 3 ---
 obs-build-20171121.tar.gz | 3 +++
 8 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 obs-build-20171117.tar.gz
 create mode 100644 obs-build-20171121.tar.gz

diff --git a/PKGBUILD b/PKGBUILD
index 69726831..e22c1089 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 58d6f62a..470d71de 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 4f06801a..14f810c3 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 8fbf2aab..9e4ac1ae 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 <adrian@suse.de>
 Architecture: all
diff --git a/build.spec b/build.spec
index 8f48002b..394affd1 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 b8ae2d1e..dfcf55e8 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 7e358889..00000000
--- 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 00000000..72a669f2
--- /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