Accepting request 915720 from openSUSE:Tools

- Fix unpacking of deb/arch archives without bsdtar

- fixed regression in multiline macro evaluation from 20th August release

OBS-URL: https://build.opensuse.org/request/show/915720
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build?expand=0&rev=136

PKGBUILD

@@ -1,5 +1,5 @@
 pkgname=build
-pkgver=20210820
+pkgver=20210902
 pkgrel=0
 pkgdesc="Build packages in sandbox"
 arch=('i686' 'x86_64')

_service

@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="manual">
-    <param name="revision">20210820</param>
+    <param name="revision">20210902</param>
-    <param name="version">20210820</param>
+    <param name="version">20210902</param>
     <param name="url">git://github.com/openSUSE/obs-build.git</param>
     <param name="scm">git</param>
     <param name="extract">dist/build.changes</param>

build.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Sep  2 09:18:33 UTC 2021 - Adrian Schröter <adrian@suse.de>
+
+- Fix unpacking of deb/arch archives without bsdtar
+
+-------------------------------------------------------------------
+Mon Aug 30 12:44:52 UTC 2021 - Adrian Schröter <adrian@suse.de>
+
+- fixed regression in multiline macro evaluation from 20th August release
+
 -------------------------------------------------------------------
 Fri Aug 20 07:44:26 UTC 2021 - Adrian Schröter <adrian@suse.de>
 

build.dsc

@@ -1,6 +1,6 @@
 Format: 1.0
 Source: build
-Version: 20210820
+Version: 20210902
 Binary: build
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: all

build.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package build
+# spec file
 #
 # Copyright (c) 2021 SUSE LLC
 #
@@ -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:        20210820
+Version:        20210902
 Release:        0
 Source:         obs-build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -65,19 +65,19 @@ BuildRequires:  perl(YAML::LibYAML)
 # None of them are actually required for core features.
 # Perl helper scripts use them.
 Recommends:     perl(Date::Language)
+Recommends:     /sbin/mkfs.ext3
+Recommends:     /usr/bin/qemu-kvm
+Recommends:     bsdtar
+Recommends:     qemu-linux-user
+Recommends:     zstd
 Recommends:     perl(Date::Parse)
 Recommends:     perl(LWP::UserAgent)
+Recommends:     perl(Net::SSL)
 Recommends:     perl(Pod::Usage)
 Recommends:     perl(Time::Zone)
 Recommends:     perl(URI)
 Recommends:     perl(XML::Parser)
-Recommends:     perl(Net::SSL)
 Recommends:     perl(YAML::LibYAML)
-Recommends:     bsdtar
-Recommends:     qemu-linux-user
-Recommends:     zstd
-Recommends:     /usr/bin/qemu-kvm
-Recommends:     /sbin/mkfs.ext3
 %endif
 
 %if 0%{?suse_version} > 1120 || ! 0%{?suse_version}
@@ -126,6 +126,7 @@ for generating delta rpm packages.
 %if "%{_host_cpu}" == "i686"
 %define initvm_arch i586
 %endif
+
 %package initvm-%{initvm_arch}
 Summary:        Virtualization initializer for emulated cross architecture builds
 Group:          Development/Tools/Building

debian.changelog

@@ -1,4 +1,4 @@
-build (20210820) unstable; urgency=low
+build (20210902) unstable; urgency=low
 
   * Update to current git trunk
     - add sles11sp2 build config and adapt autodetection

debian.control

@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
 
 Package: obs-build
 Architecture: all
-Depends: ${perl:Depends}, rpm
+Depends: ${perl:Depends}, rpm, libarchive-tools | bsdtar
 Recommends: rpm2cpio
 Conflicts: build
 Replaces: build

obs-build-20210820.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:50509e6ad3f782c5eadf2c8e4e32557fc96da9239e7e02cd8b6e5c7353249be3
-size 484099

obs-build-20210902.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb9a22f9467483119dce811bfdc758fbd3140efb1f05f4db5f11b1814a934874
+size 485561