From a3ff50b6b42c127ef2ae11a5cc4d35439fe66cb581ab812eb427b9837d7faea9 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Thu, 12 Feb 2015 11:10:09 +0000
Subject: [PATCH] - Handle also .o files as ELF relocatable objects

- Rename rpm-check.sh to pkg-diff.sh

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=175
---
 build-compare.changes       | 10 ++++++++++
 build-compare.spec          |  2 +-
 rpm-check.sh => pkg-diff.sh |  2 +-
 same-build-result.sh        |  4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)
 rename rpm-check.sh => pkg-diff.sh (99%)

diff --git a/build-compare.changes b/build-compare.changes
index 8dedd36..08e374e 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Feb 12 10:41:45 UTC 2015 - olaf@aepfle.de
+
+- Handle also .o files as ELF relocatable objects
+
+-------------------------------------------------------------------
+Thu Feb 12 08:22:09 UTC 2015 - randy.e.witt@linux.intel.com
+
+- Rename rpm-check.sh to pkg-diff.sh
+
 -------------------------------------------------------------------
 Tue Feb 10 15:35:25 UTC 2015 - olaf@aepfle.de
 
diff --git a/build-compare.spec b/build-compare.spec
index 1ccf07f..62cac35 100644
--- a/build-compare.spec
+++ b/build-compare.spec
@@ -25,7 +25,7 @@ Version:        2015.02.10
 Release:        0
 Source1:        COPYING
 Source2:        same-build-result.sh
-Source3:        rpm-check.sh
+Source3:        pkg-diff.sh
 Source4:        functions.sh
 Source5:        srpm-check.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/rpm-check.sh b/pkg-diff.sh
similarity index 99%
rename from rpm-check.sh
rename to pkg-diff.sh
index d25d652..6127afe 100644
--- a/rpm-check.sh
+++ b/pkg-diff.sh
@@ -637,7 +637,7 @@ check_single_file()
          return 1
        fi
        ;;
-    ELF*executable*|ELF*[LM]SB\ shared\ object*)
+    ELF*executable*|ELF*[LM]SB\ relocatable*|ELF*[LM]SB\ 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
diff --git a/same-build-result.sh b/same-build-result.sh
index a2d69a5..942e201 100644
--- a/same-build-result.sh
+++ b/same-build-result.sh
@@ -7,11 +7,11 @@
 # Enhanced by Andreas Jaeger <aj@suse.de>
 #
 # The script decides if the new build differes from the former one,
-# using rpm-check.sh.
+# using pkg-diff.sh.
 # The script is called as part of the build process as:
 # /usr/lib/build/same-build-result.sh /.build.oldpackages /usr/src/packages/RPMS /usr/src/packages/SRPMS
 
-CMPSCRIPT=${0%/*}/rpm-check.sh
+CMPSCRIPT=${0%/*}/pkg-diff.sh
 SCMPSCRIPT=${0%/*}/srpm-check.sh
 
 check_all=1