From 93f8372b7ab6e65dfed65fdb3df21ce73bed3d277102692e490614fb9faa42ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian.schroeter@suse.com>
Date: Fri, 6 Oct 2017 13:13:47 +0000
Subject: [PATCH] update

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=330
---
 PKGBUILD                     |  2 +-
 build-mkbaselibs-sle.changes |  5 +++--
 build-mkbaselibs-sle.spec    |  4 ++--
 build.changes                | 10 ++--------
 build.dsc                    |  2 +-
 build.spec                   |  2 +-
 debian.changelog             |  2 +-
 obs-build-20170918.tar.gz    |  3 ---
 obs-build-20171006.tar.gz    |  3 +++
 9 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 obs-build-20170918.tar.gz
 create mode 100644 obs-build-20171006.tar.gz

diff --git a/PKGBUILD b/PKGBUILD
index f74c568..dfc6ebb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20170918
+pkgver=20171006
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')
diff --git a/build-mkbaselibs-sle.changes b/build-mkbaselibs-sle.changes
index c85042a..f4d3d1a 100644
--- a/build-mkbaselibs-sle.changes
+++ b/build-mkbaselibs-sle.changes
@@ -1,7 +1,8 @@
 -------------------------------------------------------------------
-Thu Sep 21 08:58:47 UTC 2017 - coolo@suse.com
+Wed Aug 23 10:44:57 UTC 2017 - dimstar@opensuse.org
 
-- add conflict to otherproviders 
+- Conflict with other implementations of mkbaselibs (packages
+  conflict on file level).
 
 -------------------------------------------------------------------
 Wed Aug  2 14:58:59 UTC 2017 - lnussel@suse.de
diff --git a/build-mkbaselibs-sle.spec b/build-mkbaselibs-sle.spec
index 9c39b4b..9660b2d 100644
--- a/build-mkbaselibs-sle.spec
+++ b/build-mkbaselibs-sle.spec
@@ -20,14 +20,14 @@ Name:           build-mkbaselibs-sle
 Summary:        Tools to generate base lib packages
 License:        GPL-2.0+
 Group:          Development/Tools/Building
-Version:        20170918
+Version:        20171006
 Release:        0
 #!BuildIgnore:  build-mkbaselibs
 Provides:       build-mkbaselibs
+Conflicts:      otherproviders(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 71cad34..6cd8a09 100644
--- a/build.changes
+++ b/build.changes
@@ -1,13 +1,7 @@
 -------------------------------------------------------------------
-Thu Sep 21 08:55:08 UTC 2017 - coolo@suse.com
+Fri Oct  6 13:11:26 UTC 2017 - adrian@suse.de
 
-- 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
+- bring back openSUSE Leap 15.0 config
 
 -------------------------------------------------------------------
 Wed Aug  2 14:59:15 UTC 2017 - lnussel@suse.de
diff --git a/build.dsc b/build.dsc
index 164ae88..d13a652 100644
--- a/build.dsc
+++ b/build.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20170918-0
+Version: 20171006-0
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
diff --git a/build.spec b/build.spec
index 3d3e720..68661de 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:        20170918
+Version:        20171006
 Release:        0
 Source:         obs-build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/debian.changelog b/debian.changelog
index 3c45ee6..1aa695d 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,4 +1,4 @@
-build (20170918-0) unstable; urgency=low
+build (20171006-0) unstable; urgency=low
 
   * Update to current git trunk
     - add sles11sp2 build config and adapt autodetection
diff --git a/obs-build-20170918.tar.gz b/obs-build-20170918.tar.gz
deleted file mode 100644
index d5ec8ae..0000000
--- a/obs-build-20170918.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2283610bd833190e26f7ecdf0cd30606ece2854b3357af60f7f3cbe7564cd441
-size 280710
diff --git a/obs-build-20171006.tar.gz b/obs-build-20171006.tar.gz
new file mode 100644
index 0000000..ccb91cd
--- /dev/null
+++ b/obs-build-20171006.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97b3cadc48688783fd909d6e34c13f3b290e0622a821fd907601d5dc9f4afaaa
+size 306949