From 7c12216babdcaa2f4dd223289d14d9143d1328d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian.schroeter@suse.com>
Date: Fri, 31 Jan 2020 11:55:01 +0000
Subject: [PATCH] update

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=405
---
 PKGBUILD                  | 2 +-
 _service                  | 4 ++--
 build.changes             | 6 ++++++
 build.dsc                 | 2 +-
 build.spec                | 2 +-
 debian.changelog          | 2 +-
 obs-build-20200129.tar.gz | 3 ---
 obs-build-20200131.tar.gz | 3 +++
 8 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 obs-build-20200129.tar.gz
 create mode 100644 obs-build-20200131.tar.gz

diff --git a/PKGBUILD b/PKGBUILD
index f4bd225..f9fb693 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20200129
+pkgver=20200131
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')
diff --git a/_service b/_service
index 6b3c116..3bf406c 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="revision">20200129</param>
-    <param name="version">20200129</param>
+    <param name="revision">20200131</param>
+    <param name="version">20200131</param>
     <param name="url">git://github.com/openSUSE/obs-build.git</param>
     <param name="scm">git</param>
     <param name="extract">dist/build.changes</param>
diff --git a/build.changes b/build.changes
index 5140f0a..5e9dca0 100644
--- a/build.changes
+++ b/build.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 31 11:49:34 UTC 2020 - Adrian Schröter <adrian@suse.de>
+
+- fix regression in && operator handling of rpm spec file parser
+- Correctly expand macros defined with %global
+
 -------------------------------------------------------------------
 Wed Jan 29 12:57:22 UTC 2020 - Adrian Schröter <adrian@suse.de>
 
diff --git a/build.dsc b/build.dsc
index 0f7cb7f..fae46c8 100644
--- a/build.dsc
+++ b/build.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20200129
+Version: 20200131
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all
diff --git a/build.spec b/build.spec
index 84755da..29a07c0 100644
--- a/build.spec
+++ b/build.spec
@@ -28,7 +28,7 @@ Name:           %{__pkg_name}
 Summary:        A Script to Build SUSE Linux RPMs
 License:        GPL-2.0-only OR GPL-3.0-only
 Group:          Development/Tools/Building
-Version:        20200129
+Version:        20200131
 Release:        0
 Source:         obs-build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/debian.changelog b/debian.changelog
index bc16c02..bca5d82 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,4 +1,4 @@
-build (20200129) unstable; urgency=low
+build (20200131) unstable; urgency=low
 
   * Update to current git trunk
     - add sles11sp2 build config and adapt autodetection
diff --git a/obs-build-20200129.tar.gz b/obs-build-20200129.tar.gz
deleted file mode 100644
index 14abf23..0000000
--- a/obs-build-20200129.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:045b2c29e71421b1a2d38b6c2c92e1e1735e229aeb430729f36c47427e1d9ccd
-size 342163
diff --git a/obs-build-20200131.tar.gz b/obs-build-20200131.tar.gz
new file mode 100644
index 0000000..1daea7a
--- /dev/null
+++ b/obs-build-20200131.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9442bb5d6c48f987bbf6a9678537e36c26abbc451a6f76b05a8849dd4981df08
+size 342012