diff --git a/PKGBUILD b/PKGBUILD index 7ced8a22..f9fb6939 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200124.1 +pkgver=20200131 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 79818457..3bf406c0 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200124.1 - 20200124.1 + 20200131 + 20200131 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 8e9a2956..5e9dca0c 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Jan 31 11:49:34 UTC 2020 - Adrian Schröter + +- 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 + +- 15.2 config: temporary revert gcrypt preinstall until distro has changed +- factory config: ignore libxtables for iproute2, not needed for ip tool +- Follow upstream rpm changes in regard to logical ops +- Fix macro expansion of lines containing newlines +- add missing header file to avoid compile warnings + +------------------------------------------------------------------- +Tue Jan 28 15:20:28 UTC 2020 - Adrian Schröter + +- support OBS-Milestone comment for kiwi +- switch to preinstall expansion for factory + ------------------------------------------------------------------- Fri Jan 24 15:44:00 UTC 2020 - Adrian Schröter diff --git a/build.dsc b/build.dsc index 9fcc7e37..fae46c88 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200124.1 +Version: 20200131 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 56f7150a..29a07c09 100644 --- a/build.spec +++ b/build.spec @@ -1,7 +1,7 @@ # # spec file for package build # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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: 20200124.1 +Version: 20200131 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index b7342eed..bca5d827 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200124.1) 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-20200124.1.tar.gz b/obs-build-20200124.1.tar.gz deleted file mode 100644 index b9387d76..00000000 --- a/obs-build-20200124.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:798d77a7f3c9fa7f6b12bdfeb0026774cd39c6b7f56f88181ae5d40a5ac35752 -size 340455 diff --git a/obs-build-20200131.tar.gz b/obs-build-20200131.tar.gz new file mode 100644 index 00000000..1daea7aa --- /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