From 2e4c11edc8c99688310d0fc8e51677c9721452ab Mon Sep 17 00:00:00 2001 From: OBS User adrianSuSE Date: Wed, 5 Feb 2020 08:32:14 +0000 Subject: [PATCH] update Rev openSUSE:Tools/411 Md5 ff74b4c77a63da347ee66259f4243c35 2020-02-05 08:32:14 adrianSuSE None --- PKGBUILD | 2 +- _service | 4 ++-- build.changes | 10 ++++++++++ build.dsc | 2 +- build.spec | 18 +++++++++++------- debian.changelog | 2 +- obs-build-20200131.tar.gz | 3 --- obs-build-20200205.tar.gz | 3 +++ 8 files changed, 29 insertions(+), 15 deletions(-) delete mode 100644 obs-build-20200131.tar.gz create mode 100644 obs-build-20200205.tar.gz diff --git a/PKGBUILD b/PKGBUILD index f9fb6939..5cf00eb2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=build -pkgver=20200131 +pkgver=20200205 pkgrel=0 pkgdesc="Build packages in sandbox" arch=('i686' 'x86_64') diff --git a/_service b/_service index 3bf406c0..17e6b841 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 20200131 - 20200131 + 20200205 + 20200205 git://github.com/openSUSE/obs-build.git git dist/build.changes diff --git a/build.changes b/build.changes index 5e9dca0c..9450af19 100644 --- a/build.changes +++ b/build.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Feb 5 08:23:06 UTC 2020 - Adrian Schröter + +- 15.2 config: preinstall gcrypt deps again +- Recommends for Fedora based distros +- support obsgendiff funcationality +- various smaller code cleanups +- additional test cases for spec file parsing +- various fixes for cornercases during spec file parsing + ------------------------------------------------------------------- Fri Jan 31 11:49:34 UTC 2020 - Adrian Schröter diff --git a/build.dsc b/build.dsc index fae46c88..927876c1 100644 --- a/build.dsc +++ b/build.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: build -Version: 20200131 +Version: 20200205 Binary: build Maintainer: Adrian Schroeter Architecture: all diff --git a/build.spec b/build.spec index fdd25cd5..3b9218bd 100644 --- a/build.spec +++ b/build.spec @@ -18,17 +18,17 @@ # needsbinariesforbuild -%if 0%{?fedora} || 0%{?rhel} -%define __pkg_name obs-build -%else +%if 0%{?suse_version} %define __pkg_name build +%else +%define __pkg_name obs-build %endif 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: 20200131 +Version: 20200205 Release: 0 Source: obs-build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +47,10 @@ BuildRequires: binutils BuildRequires: perl BuildRequires: psmisc BuildRequires: tar +# For testcases +BuildRequires: perl(Date::Parse) +BuildRequires: perl(Test::Harness) +BuildRequires: perl(Test::More) %if 0%{?fedora} Requires: perl-MD5 Requires: perl-TimeDate @@ -56,7 +60,7 @@ Conflicts: bsdtar < 2.5.5 BuildRequires: perl(Date::Parse) BuildRequires: perl(Test::Harness) BuildRequires: perl(Test::More) -%if 0%{?suse_version} > 1000 +%if 0%{?suse_version} > 1000 || 0%{?centos_version} >= 800 || 0%{?rhel_version} >= 800 || 0%{?fedora_version} >= 21 # None of them are actually required for core features. # Perl helper scripts use them. Recommends: perl(Date::Language) @@ -204,8 +208,8 @@ test -e baselibs_global.conf || exit 1 %check for i in build build-* ; do bash -n $i || exit 1 ; done -# expect unit tests -LANG=C prove -I. -v t/*.t || exit 1 +# run perl module unit tests +LANG=C make test || exit 1 if [ `whoami` != "root" ]; then echo "WARNING: Not building as root, build test did not run!" diff --git a/debian.changelog b/debian.changelog index bca5d827..9a66eef5 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -build (20200131) unstable; urgency=low +build (20200205) unstable; urgency=low * Update to current git trunk - add sles11sp2 build config and adapt autodetection diff --git a/obs-build-20200131.tar.gz b/obs-build-20200131.tar.gz deleted file mode 100644 index 1daea7aa..00000000 --- a/obs-build-20200131.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9442bb5d6c48f987bbf6a9678537e36c26abbc451a6f76b05a8849dd4981df08 -size 342012 diff --git a/obs-build-20200205.tar.gz b/obs-build-20200205.tar.gz new file mode 100644 index 00000000..0e4c8400 --- /dev/null +++ b/obs-build-20200205.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eafe941911293df7d6f5f421f02249d078df26331760b03acd035bc8985bb1cb +size 344072