From f99f2c68bc1c6fc9affaa7f7856e4570764952e5c0a29422cea218598351014f Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 20 Oct 2009 22:06:43 +0000
Subject: [PATCH] checked in

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

diff --git a/build-compare.changes b/build-compare.changes
index aa78791..97b96dc 100644
--- a/build-compare.changes
+++ b/build-compare.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-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 a60d4cf..2aab2df 100644
--- a/build-compare.spec
+++ b/build-compare.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package build-compare (Version 2009.10.14)
+# spec file for package build-compare (Version 2009.08.20)
 #
 # 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.10.14
-Release:        1
+Version:        2009.08.20
+Release:        3
 Source:         same-build-result.sh
 Source1:        rpm-check.sh
 Source2:        COPYING
diff --git a/rpm-check.sh b/rpm-check.sh
index 06ccd9d..152537f 100644
--- a/rpm-check.sh
+++ b/rpm-check.sh
@@ -8,6 +8,11 @@
 
 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)
@@ -33,18 +38,6 @@ 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()
 {
@@ -209,12 +202,12 @@ dir=`mktemp -d`
 cd $dir
 mkdir old
 cd old
-unrpm $oldrpm
+/usr/bin/unrpm -q $oldrpm
 cd ..
 
 mkdir new
 cd new
-unrpm $newrpm
+/usr/bin/unrpm -q $newrpm
 cd ..
 
 dfile=`mktemp`