Accepting request 769043: - fix regression in && operator handling of rpm spec file parser

- Correctly expand macros defined with %global

- 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

- support OBS-Milestone comment for kiwi
- switch to preinstall expansion for factory

Rev openSUSE:Factory/130 Md5 d340945da44581034257c47e440131cc 2020-02-03 10:10:37 dimstar_suse 769043
This commit is contained in:
OBS User dimstar_suse 2020-02-03 10:10:37 +00:00 committed by Git OBS Bridge
commit 9d40e378ff
8 changed files with 31 additions and 10 deletions

View File

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

View File

@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="revision">20200124.1</param>
<param name="version">20200124.1</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>

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
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>
- 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 <adrian@suse.de>
- support OBS-Milestone comment for kiwi
- switch to preinstall expansion for factory
-------------------------------------------------------------------
Fri Jan 24 15:44:00 UTC 2020 - Adrian Schröter <adrian@suse.de>

View File

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

View File

@ -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

View File

@ -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

View File

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

View File

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