From 4a4f0edfd39a9e438c37e65784c496b91bfdca58 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Tue, 3 Oct 2017 03:03:36 +0000
Subject: [PATCH] Accepting request 527666 from
 home:coolo:branches:openSUSE:Factory

- add conflict to otherproviders

- Support getting the container tags from the Dockerfile
- Put the disturl in the .buildenv file
- Support rpm-buildroot-override buildflag
- Support kvm builds on Debian
- Support with/without/unless rich deps
- Added obs-docker-support script for docker images
- Initial SLE 15 config

OBS-URL: https://build.opensuse.org/request/show/527666
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=328
---
 PKGBUILD                     |  2 +-
 build-mkbaselibs-sle.changes |  5 +++++
 build-mkbaselibs-sle.spec    |  3 ++-
 build.changes                | 11 +++++++++++
 build.dsc                    |  2 +-
 build.spec                   |  2 +-
 debian.changelog             |  2 +-
 obs-build-20170804.tar.gz    |  3 ---
 obs-build-20170918.tar.gz    |  3 +++
 9 files changed, 25 insertions(+), 8 deletions(-)
 delete mode 100644 obs-build-20170804.tar.gz
 create mode 100644 obs-build-20170918.tar.gz

diff --git a/PKGBUILD b/PKGBUILD
index e976a94..a493ca9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20170804
+pkgver=20170918
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')
diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes
index 6d0f857..f422920 100644
--- a/build-mkbaselibs-sle.changes
+++ b/build-mkbaselibs-sle.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 21 08:58:47 UTC 2017 - coolo@suse.com
+
+- add conflict to otherproviders 
+
 -------------------------------------------------------------------
 Wed Aug  2 14:58:59 UTC 2017 - lnussel@suse.de
 
diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec
index 356b86e..d5fd2b5 100644
--- a/build-mkbaselibs-sle.spec
+++ b/build-mkbaselibs-sle.spec
@@ -20,13 +20,14 @@ Name:           build-mkbaselibs-sle
 Summary:        Tools to generate base lib packages
 License:        GPL-2.0+
 Group:          Development/Tools/Building
-Version:        20170804
+Version:        20170918
 Release:        0
 #!BuildIgnore:  build-mkbaselibs
 Provides:       build-mkbaselibs
 Source:         obs-build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+Conflicts:      otherproviders(build-mkbaselibs)
 
 %description
 This package contains the parts which may be installed in the inner build system
diff --git a/build.changes b/build.changes
index ddca9ad..c6e0d88 100644
--- a/build.changes
+++ b/build.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Sep 21 08:55:08 UTC 2017 - coolo@suse.com
+
+- Support getting the container tags from the Dockerfile
+- Put the disturl in the .buildenv file
+- Support rpm-buildroot-override buildflag
+- Support kvm builds on Debian
+- Support with/without/unless rich deps
+- Added obs-docker-support script for docker images
+- Initial SLE 15 config
+
 -------------------------------------------------------------------
 Wed Aug  2 14:59:15 UTC 2017 - lnussel@suse.de
 
diff --git a/build.dsc b/build.dsc
index 73181a8..ae063b7 100644
--- a/build.dsc
+++ b/build.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20170804-0
+Version: 20170918-0
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
diff --git a/build.spec b/build.spec
index e419bb5..326d897 100644
--- a/build.spec
+++ b/build.spec
@@ -22,7 +22,7 @@ Name:           build
 Summary:        A Script to Build SUSE Linux RPMs
 License:        GPL-2.0+ and GPL-2.0
 Group:          Development/Tools/Building
-Version:        20170804
+Version:        20170918
 Release:        0
 Source:         obs-build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/debian.changelog b/debian.changelog
index 62bddf3..5074b3f 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,4 +1,4 @@
-build (20170804-0) unstable; urgency=low
+build (20170918-0) unstable; urgency=low
 
   * Update to current git trunk
     - add sles11sp2 build config and adapt autodetection
diff --git a/obs-build-20170804.tar.gz b/obs-build-20170804.tar.gz
deleted file mode 100644
index e8c9ef6..0000000
--- a/obs-build-20170804.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86f9e08880031b39a7ffbc8a889587710c09262fef747c5427a901a7a955edc0
-size 281132
diff --git a/obs-build-20170918.tar.gz b/obs-build-20170918.tar.gz
new file mode 100644
index 0000000..57030fd
--- /dev/null
+++ b/obs-build-20170918.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2283610bd833190e26f7ecdf0cd30606ece2854b3357af60f7f3cbe7564cd441
+size 280710