From 7fd0ceea807a69a7bb51ad8edf995fdbae6765bfe3c5dd66bfe8ff2fdf6588d0 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 22 Oct 2009 09:04:00 +0000
Subject: [PATCH] - take out debugging code

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=42
---
 build-compare.changes | 11 +++++++++++
 build-compare.spec    |  6 +++---
 rpm-check.sh          | 24 +++++++++++++++---------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/build-compare.changes b/build-compare.changes
index 97b96dc..c3b462b 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Oct 22 09:03:46 UTC 2009 - coolo@novell.com
+
+- take out debugging code
+
+-------------------------------------------------------------------
+Wed Oct 14 07:14:37 UTC 2009 - aj@suse.de
+
+- Replace external /usr/bin/unrpm by small function to get 
+  rid of dependency of build.rpm.
+
 -------------------------------------------------------------------
 Thu Sep 24 06:47:22 UTC 2009 - aj@suse.de
 
diff --git a/build-compare.spec b/build-compare.spec
index 2aab2df..a60d4cf 100644
--- a/build-compare.spec
+++ b/build-compare.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package build-compare (Version 2009.08.20)
+# spec file for package build-compare (Version 2009.10.14)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -23,8 +23,8 @@ License:        GPL v2 or later
 Group:          Development/Tools/Building
 AutoReqProv:    on
 Summary:        Build Result Compare Script
-Version:        2009.08.20
-Release:        3
+Version:        2009.10.14
+Release:        1
 Source:         same-build-result.sh
 Source1:        rpm-check.sh
 Source2:        COPYING
diff --git a/rpm-check.sh b/rpm-check.sh
index 152537f..2d57fe7 100644
--- a/rpm-check.sh
+++ b/rpm-check.sh
@@ -8,11 +8,6 @@
 
 RPM="rpm -qp --nodigest --nosignature"
 
-if [ ! -e /usr/bin/unrpm ] ; then
-  echo "unrpm is not installed - comparison not possible"
-  exit 1
-fi
-
 check_all=
 case $1 in
   -a | --check-all)
@@ -38,6 +33,18 @@ if test ! -f $newrpm; then
     exit 1
 fi
 
+#usage unrpm <file>
+# Unpack rpm files in current directory
+# like /usr/bin/unrpm - just for one file and with no options
+function unrpm()
+{
+    local file
+    file=$1
+    CPIO_OPTS="--extract --unconditional --preserve-modification-time --make-directories --quiet"
+
+    rpm2cpio $file | cpio ${CPIO_OPTS}
+}
+
 #usage unjar <file>
 function unjar()
 {
@@ -104,8 +111,7 @@ QF="%{NAME}"
 # don't look at RELEASE, it contains our build number
 QF="$QF %{VERSION} %{EPOCH}\\n"
 QF="$QF %{SUMMARY}\\n%{DESCRIPTION}\\n"
-# ignored for now
-#QF="$QF %{VENDOR} %{DISTRIBUTION}"
+QF="$QF %{VENDOR} %{DISTRIBUTION} %{DISTURL}"
 QF="$QF %{LICENSE} %{LICENSE}\\n"
 QF="$QF %{GROUP} %{URL} %{EXCLUDEARCH} %{EXCLUDEOS} %{EXCLUSIVEARCH}\\n"
 QF="$QF %{EXCLUSIVEOS} %{RPMVERSION} %{PLATFORM}\\n"
@@ -202,12 +208,12 @@ dir=`mktemp -d`
 cd $dir
 mkdir old
 cd old
-/usr/bin/unrpm -q $oldrpm
+unrpm $oldrpm
 cd ..
 
 mkdir new
 cd new
-/usr/bin/unrpm -q $newrpm
+unrpm $newrpm
 cd ..
 
 dfile=`mktemp`