diff --git a/_service b/_service index 16800ff..abd0f4f 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ %ci.%h - git://github.com/openSUSE/build-compare.git + https://github.com/openSUSE/build-compare.git git diff --git a/build-compare.changes b/build-compare.changes index 9e67ad2..062b3de 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Sep 21 19:19:19 UTC 2021 - Stephan Kulow + +- Fix build-compare for shadow package + +------------------------------------------------------------------- +Mon Sep 20 08:25:27 UTC 2021 - Andreas Schwab + +- Properly drop another duration from rpmlint.log + +------------------------------------------------------------------- +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..5044494 100644 --- a/build-compare.spec +++ b/build-compare.spec @@ -21,7 +21,7 @@ Summary: Build Result Compare Script License: GPL-2.0+ Group: Development/Tools/Building Url: https://github.com/openSUSE/build-compare -Version: 20210811T224256.f313711 +Version: 20210921T214418.86d06d9 Release: 0 Source1: COPYING Source2: same-build-result.sh diff --git a/pkg-diff.sh b/pkg-diff.sh index 3ec0606..4eee363 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -893,7 +893,9 @@ check_single_file() monodis "new/$file" 2>/dev/null|sed -e 's/GUID = {.*}/GUID = { 42 }/;'> ${file2} if ! cmp -s "${file1}" "${file2}"; then wprint "$file differs ($ftype)" - diff --speed-large-files -u "${file1}" "${file2}" + diff --speed-large-files -u \ + --label "old $file (monodis)" "${file1}" \ + --label "new $file (monodis)" "${file2}" return 1 fi else @@ -904,9 +906,9 @@ check_single_file() ELF*executable*|\ ELF*[LM]SB\ relocatable*|\ ELF*[LM]SB\ shared\ object*|\ - setuid\ ELF*[LM]SB\ shared\ object*|\ + set?id\ ELF*[LM]SB\ shared\ object*|\ ELF*[LM]SB\ pie\ executable*|\ - setuid\ ELF*[LM]SB\ pie\ executable*) + set?id\ ELF*[LM]SB\ pie\ executable*) diff --speed-large-files --unified \ --label "old $file (disasm)" \ --label "new $file (disasm)" \ diff --git a/same-build-result.sh b/same-build-result.sh index 6937c2b..3c2868f 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| + s/; has taken [0-9]\+\.[0-9] s/; has taken x.x s/ " $file1 $file2 if ! cmp -s $file1 $file2; then echo "rpmlint.log files differ:"