From f99f2c68bc1c6fc9affaa7f7856e4570764952e5c0a29422cea218598351014f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Oct 2009 22:06:43 +0000 Subject: [PATCH 1/4] 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 -# 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 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` From 7fd0ceea807a69a7bb51ad8edf995fdbae6765bfe3c5dd66bfe8ff2fdf6588d0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 22 Oct 2009 09:04:00 +0000 Subject: [PATCH 2/4] - 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 +# 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 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` From 69801c357c846b11f34d193ad418eb0aa430963932dd9fa12036eda35b855bac Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 22 Oct 2009 09:09:22 +0000 Subject: [PATCH 3/4] checked in OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=43 --- build-compare.changes | 5 ----- rpm-check.sh | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index c3b462b..aa78791 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/rpm-check.sh b/rpm-check.sh index 2d57fe7..06ccd9d 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -111,7 +111,8 @@ QF="%{NAME}" # don't look at RELEASE, it contains our build number QF="$QF %{VERSION} %{EPOCH}\\n" QF="$QF %{SUMMARY}\\n%{DESCRIPTION}\\n" -QF="$QF %{VENDOR} %{DISTRIBUTION} %{DISTURL}" +# ignored for now +#QF="$QF %{VENDOR} %{DISTRIBUTION}" QF="$QF %{LICENSE} %{LICENSE}\\n" QF="$QF %{GROUP} %{URL} %{EXCLUDEARCH} %{EXCLUDEOS} %{EXCLUSIVEARCH}\\n" QF="$QF %{EXCLUSIVEOS} %{RPMVERSION} %{PLATFORM}\\n" From 450623db6b35d6724660e032a78ebc620ff30cf1c47def188c1ded4df29ed29e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 22 Oct 2009 09:09:26 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/build-compare revision 19.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/build-compare?expand=0&rev=f5e435a40c8d78800e191ac01e4502f7 --- build-compare.changes | 5 +++++ build-compare.spec | 2 +- rpm-check.sh | 3 +-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build-compare.changes b/build-compare.changes index aa78791..c3b462b 100644 --- a/build-compare.changes +++ b/build-compare.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/build-compare.spec b/build-compare.spec index a60d4cf..58b2c01 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: 1 +Release: 2 Source: same-build-result.sh Source1: rpm-check.sh Source2: COPYING diff --git a/rpm-check.sh b/rpm-check.sh index 06ccd9d..2d57fe7 100644 --- a/rpm-check.sh +++ b/rpm-check.sh @@ -111,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"