update

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build?expand=0&rev=405
2020-01-31 11:55:01 +00:00 · 2020-01-31 11:55:01 +00:00 · 7c12216bab
commit 7c12216bab
parent d6c966b2e9
8 changed files with 15 additions and 9 deletions
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20200129
+pkgver=20200131
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')
--- a/4
+++ b/4
@ -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>
--- 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>

--- 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
--- 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
--- 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
--- a/obs-build-20200129.tar.gz
+++ b/obs-build-20200129.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:045b2c29e71421b1a2d38b6c2c92e1e1735e229aeb430729f36c47427e1d9ccd
-size 342163
--- a/obs-build-20200131.tar.gz
+++ b/obs-build-20200131.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9442bb5d6c48f987bbf6a9678537e36c26abbc451a6f76b05a8849dd4981df08
+size 342012