From 6855de7c23f0ebda6fe0c54fff7e43549ec21bc10119ae2061d3e5dd09689aae Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 6 Sep 2021 08:44:23 +0000 Subject: [PATCH] rebase OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=284 --- build-compare.changes | 5 +++++ build-compare.spec | 13 ++++++------- same-build-result.sh | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 9e67ad2..64a7a2d 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 6 07:15:06 UTC 2021 - bwiedemann@suse.de + +- Drop another duration from rpmlint.log + ------------------------------------------------------------------- Wed Aug 11 20:30:40 UTC 2021 - olaf@aepfle.de diff --git a/build-compare.spec b/build-compare.spec index 1e4d42f..18b5d74 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -1,7 +1,7 @@ # # spec file for package build-compare # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,16 +12,16 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: build-compare Summary: Build Result Compare Script -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Tools/Building -Url: https://github.com/openSUSE/build-compare -Version: 20210811T224256.f313711 +URL: https://github.com/openSUSE/build-compare +Version: 20210906T092724.c14c0a7 Release: 0 Source1: COPYING Source2: same-build-result.sh @@ -30,8 +30,8 @@ Source4: functions.sh Source5: srpm-check.sh %if 0%{?suse_version} Requires: bash -Requires: cpio Requires: coreutils +Requires: cpio Requires: diffutils Requires: file Requires: gawk @@ -47,7 +47,6 @@ BuildArch: noarch This package contains scripts to find out if the build result differs to a former build. - %prep %setup -q -c -T diff --git a/same-build-result.sh b/same-build-result.sh index 6937c2b..cde7679 100644 --- a/same-build-result.sh +++ b/same-build-result.sh @@ -151,6 +151,7 @@ if test -n "$OTHERDIR"; then /: W: python-bytecode-inconsistent-mtime /d /: W: filename-too-long-for-joliet /d /: I: \(filelist-initialization\|check-completed\) /s| [0-9]\+\.[0-9] s| x.x s| + /specfiles checked;/s| [0-9]\+\.[0-9] s$| x.x s| " $file1 $file2 if ! cmp -s $file1 $file2; then echo "rpmlint.log files differ:"