From fa1e1998e51f9d29b88ca16c847c28f09ba3e7bce1c3ead536bef1ed99a1010d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 25 May 2010 07:35:03 +0000 Subject: [PATCH] Accepting request 40612 from home:a_jaeger:branches:build-compare-test Copy from home:a_jaeger:branches:build-compare-test/build-compare via accept of submit request 40612 revision 30. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/40612 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=71 --- build-compare.changes | 10 ++++++++++ rpm-check.sh | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 38b70b8..01f454d 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun May 23 12:19:56 UTC 2010 - aj@suse.de + +- Release is at end of line, avoid wrong matches. + +------------------------------------------------------------------- +Fri May 21 21:46:47 UTC 2010 - cmorve69@yahoo.es + +- Improved ELF executable detection (bnc#604049). + ------------------------------------------------------------------- Thu May 20 08:23:52 UTC 2010 - aj@suse.de diff --git a/rpm-check.sh b/rpm-check.sh index a1ef2bc..b80f9aa 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -159,7 +159,7 @@ check_provides() QF="$QF [%{REQUIRENAME} %{REQUIREFLAGS} %{REQUIREVERSION}\\n]\\n" QF="$QF [%{CONFLICTNAME} %{CONFLICTFLAGS} %{CONFLICTVERSION}\\n]\\n" QF="$QF [%{OBSOLETENAME} %{OBSOLETEFLAGS} %{OBSOLETEVERSION}\\n]\\n" - check_header "$1" | sed -e "s,-$2,-@RELEASE@," + check_header "$1" | sed -e "s,-$2$,-@RELEASE@," } check_provides $oldrpm $release1 > $file1 @@ -462,7 +462,7 @@ check_single_file() return 1 fi ;; - *executable*|*LSB\ shared\ object*) + *ELF*executable*|*ELF*LSB\ shared\ object*) objdump -d --no-show-raw-insn old/$file | filter_disasm > $file1 if ! test -s $file1; then # objdump has no idea how to handle it