From fc3a11029f821f42ae4f6eef4729787aed3ca00f06fbaa6fa7a09a9778616b86 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 25 May 2010 12:57:17 +0000
Subject: [PATCH] Accepting request 40613 from openSUSE:Tools

Copy from openSUSE:Tools/build-compare based on submit request 40613 from user a_jaeger

OBS-URL: https://build.opensuse.org/request/show/40613
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/build-compare?expand=0&rev=32
---
 build-compare.changes | 10 ++++++++++
 build-compare.spec    |  2 +-
 rpm-check.sh          |  4 ++--
 3 files changed, 13 insertions(+), 3 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/build-compare.spec b/build-compare.spec
index a813131..5d6a421 100644
--- a/build-compare.spec
+++ b/build-compare.spec
@@ -24,7 +24,7 @@ Group:          Development/Tools/Building
 AutoReqProv:    on
 Summary:        Build Result Compare Script
 Version:        2009.10.14
-Release:        13
+Release:        14
 Source:         same-build-result.sh
 Source1:        rpm-check.sh
 Source2:        COPYING
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