diff --git a/PKGBUILD b/PKGBUILD index a79e95fe..cb5d766d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20210820 +pkgver=20210902 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index decbed48..40bb5ce4 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20210820 - 20210820 + 20210902 + 20210902 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index ef60ffb8..76c235a4 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 2 09:18:33 UTC 2021 - Adrian Schröter + +- Fix unpacking of deb/arch archives without bsdtar + +------------------------------------------------------------------- +Mon Aug 30 12:44:52 UTC 2021 - Adrian Schröter + +- fixed regression in multiline macro evaluation from 20th August release + ------------------------------------------------------------------- Fri Aug 20 07:44:26 UTC 2021 - Adrian Schröter diff --git a/build.dsc b/build.dsc index c2e6536c..33db819d 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20210820 +Version: 20210902 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index fc2ac161..d7bc764c 100644 --- a/build.spec +++ b/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 diff --git a/debian.changelog b/debian.changelog index 393e70b4..102e06ba 100644 --- a/debian.changelog +++ b/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 diff --git a/debian.control b/debian.control index 4823cbe1..f8d144a9 100644 --- a/debian.control +++ b/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 diff --git a/obs-build-20210820.tar.gz b/obs-build-20210820.tar.gz deleted file mode 100644 index 851d6305..00000000 --- a/obs-build-20210820.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50509e6ad3f782c5eadf2c8e4e32557fc96da9239e7e02cd8b6e5c7353249be3 -size 484099 diff --git a/obs-build-20210902.tar.gz b/obs-build-20210902.tar.gz new file mode 100644 index 00000000..93ac7c0f --- /dev/null +++ b/obs-build-20210902.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb9a22f9467483119dce811bfdc758fbd3140efb1f05f4db5f11b1814a934874 +size 485561