From b0e40ae87da1bae6b11495e878405c4bfff9df29 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 28 Jan 2020 15:25:18 +0000 Subject: [PATCH 1/4] update Rev openSUSE:Tools/402 Md5 06a3169b88e80dcdec56b5268619f732 2020-01-28 15:25:18 adrianSuSE None --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 6 ++++++ build.dsc | 2 +- build.spec | 4 ++-- debian.changelog | 2 +- obs-build-20200124.1.tar.gz | 3 --- obs-build-20200128.tar.gz | 3 +++ 8 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 obs-build-20200124.1.tar.gz create mode 100644 obs-build-20200128.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 7ced8a22..accf3dbf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200124.1 +pkgver=20200128 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 79818457..c1ee233e 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200124.1 - 20200124.1 + 20200128 + 20200128 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 8e9a2956..f0f0a431 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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..734fceaa 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200124.1 +Version: 20200128 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 56f7150a..2ddc6b65 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: 20200128 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index b7342eed..b1546184 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200124.1) unstable; urgency=low +build (20200128) 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-20200128.tar.gz b/obs-build-20200128.tar.gz new file mode 100644 index 00000000..63227481 --- /dev/null +++ b/obs-build-20200128.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4776fb54283c5d91fa14dd4543e682f0dd618e3124e1a75134ed3eea9677589 +size 341797 From 21d876cbb193115841dc48ca745e38bf45b61f18 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Tue, 28 Jan 2020 15:58:57 +0000 Subject: [PATCH 2/4] without iproute2 Rev openSUSE:Tools/403 Md5 9622e7f57ca0118f933b74bd430a7130 2020-01-28 15:58:57 adrianSuSE None --- obs-build-20200128.tar.gz | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/obs-build-20200128.tar.gz b/obs-build-20200128.tar.gz index 63227481..0234590e 100644 --- a/obs-build-20200128.tar.gz +++ b/obs-build-20200128.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4776fb54283c5d91fa14dd4543e682f0dd618e3124e1a75134ed3eea9677589 -size 341797 +oid sha256:3bf0675e38ab7727e82d4a19bc07499568fa197adc95b584c2f7b95034bb154f +size 341760 From cc9e5376fc97677d243ace0607b6ae220bc59b7a Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Wed, 29 Jan 2020 13:04:23 +0000 Subject: [PATCH 3/4] fix build for 15.2 Rev openSUSE:Tools/404 Md5 f9d4e1d5b466e20099e121eaa0af1c6e 2020-01-29 13:04:23 adrianSuSE None --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 9 +++++++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20200128.tar.gz | 3 --- obs-build-20200129.tar.gz | 3 +++ 8 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 obs-build-20200128.tar.gz create mode 100644 obs-build-20200129.tar.gz diff --git a/PKGBUILD b/PKGBUILD index accf3dbf..f4bd2254 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200128 +pkgver=20200129 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index c1ee233e..6b3c116e 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200128 - 20200128 + 20200129 + 20200129 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index f0f0a431..5140f0aa 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 diff --git a/build.dsc b/build.dsc index 734fceaa..0f7cb7fb 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200128 +Version: 20200129 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 2ddc6b65..84755dab 100644 --- 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: 20200128 +Version: 20200129 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/debian.changelog b/debian.changelog index b1546184..bc16c026 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200128) unstable; urgency=low +build (20200129) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20200128.tar.gz b/obs-build-20200128.tar.gz deleted file mode 100644 index 0234590e..00000000 --- a/obs-build-20200128.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3bf0675e38ab7727e82d4a19bc07499568fa197adc95b584c2f7b95034bb154f -size 341760 diff --git a/obs-build-20200129.tar.gz b/obs-build-20200129.tar.gz new file mode 100644 index 00000000..14abf237 --- /dev/null +++ b/obs-build-20200129.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:045b2c29e71421b1a2d38b6c2c92e1e1735e229aeb430729f36c47427e1d9ccd +size 342163 From ec2c6e65f1788eb7edead49d1ea420a02e299ef3 Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Fri, 31 Jan 2020 11:55:01 +0000 Subject: [PATCH 4/4] update Rev openSUSE:Tools/405 Md5 3f4f75c462a19a99c16ff5d6666264d6 2020-01-31 11:55:01 adrianSuSE None --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 6 ++++++ build.dsc | 2 +- build.spec | 2 +- debian.changelog | 2 +- obs-build-20200129.tar.gz | 3 --- obs-build-20200131.tar.gz | 3 +++ 8 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 obs-build-20200129.tar.gz create mode 100644 obs-build-20200131.tar.gz diff --git a/PKGBUILD b/PKGBUILD index f4bd2254..f9fb6939 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200129 +pkgver=20200131 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 6b3c116e..3bf406c0 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200129 - 20200129 + 20200131 + 20200131 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 5140f0aa..5e9dca0c 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/build.dsc b/build.dsc index 0f7cb7fb..fae46c88 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200129 +Version: 20200131 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index 84755dab..29a07c09 100644 --- 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 diff --git a/debian.changelog b/debian.changelog index bc16c026..bca5d827 100644 --- 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 diff --git a/obs-build-20200129.tar.gz b/obs-build-20200129.tar.gz deleted file mode 100644 index 14abf237..00000000 --- a/obs-build-20200129.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:045b2c29e71421b1a2d38b6c2c92e1e1735e229aeb430729f36c47427e1d9ccd -size 342163 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