From 57861b39d67052825efaeef315d110813dbf73e55b95e67b7eb0e766af9d7078 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 25 May 2010 12:57:16 +0000 Subject: [PATCH] Accepting request 40613 from openSUSE:Tools checked in (request 40613) OBS-URL: https://build.opensuse.org/request/show/40613 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=72 --- build-compare.changes | 10 ---------- rpm-check.sh | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index 01f454d..38b70b8 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,13 +1,3 @@ -------------------------------------------------------------------- -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 b80f9aa..a1ef2bc 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 ;; - *ELF*executable*|*ELF*LSB\ shared\ object*) + *executable*|*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